summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-28 09:57:05 -0400
committerGravatar GitHub2018-08-28 09:57:05 -0400
commit0d2435343a2acf114430a662192eb22470b53d62 (patch)
tree8cec652adf5957e906bfd2b785c91d47dcde0f2a /src
parentMerge pull request #1165 from bunnei/shader-cache (diff)
parentFix two stupid errors made in #1141 (diff)
downloadyuzu-0d2435343a2acf114430a662192eb22470b53d62.tar.gz
yuzu-0d2435343a2acf114430a662192eb22470b53d62.tar.xz
yuzu-0d2435343a2acf114430a662192eb22470b53d62.zip
Merge pull request #1190 from FearlessTobi/im-so-retarded
yuzu: Fix two stupid errors made in #1141
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp2
-rw-r--r--src/yuzu/main.ui1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 9ca1626d1..ffa9f72aa 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -893,6 +893,7 @@ void GMainWindow::OnStartGame() {
893 893
894 ui.action_Pause->setEnabled(true); 894 ui.action_Pause->setEnabled(true);
895 ui.action_Stop->setEnabled(true); 895 ui.action_Stop->setEnabled(true);
896 ui.action_Restart->setEnabled(true);
896} 897}
897 898
898void GMainWindow::OnPauseGame() { 899void GMainWindow::OnPauseGame() {
@@ -901,7 +902,6 @@ void GMainWindow::OnPauseGame() {
901 ui.action_Start->setEnabled(true); 902 ui.action_Start->setEnabled(true);
902 ui.action_Pause->setEnabled(false); 903 ui.action_Pause->setEnabled(false);
903 ui.action_Stop->setEnabled(true); 904 ui.action_Stop->setEnabled(true);
904 ui.action_Restart->setEnabled(true);
905} 905}
906 906
907void GMainWindow::OnStopGame() { 907void GMainWindow::OnStopGame() {
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index d4c26b80a..faa0c626a 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -74,6 +74,7 @@
74 <addaction name="action_Start"/> 74 <addaction name="action_Start"/>
75 <addaction name="action_Pause"/> 75 <addaction name="action_Pause"/>
76 <addaction name="action_Stop"/> 76 <addaction name="action_Stop"/>
77 <addaction name="action_Restart"/>
77 <addaction name="separator"/> 78 <addaction name="separator"/>
78 <addaction name="action_Configure"/> 79 <addaction name="action_Configure"/>
79 </widget> 80 </widget>