Merge branch 'master' of github.com:3dsfug/Anemone3DS

2017-09-04 14:40:28 -04:00
parent 02526707a0 494962dc88
commit 04ebe9e498
1 changed files with 8 additions and 4 deletions
--- a/source/main.c
+++ b/source/main.c
@@ -125,10 +125,14 @@ int main(void)
            splash_mode = !splash_mode;
        } else if (kDown & KEY_R)
        {
-            qr_mode = !qr_mode;
-            if (qr_mode) init_qr();
-            else exit_qr();
-            continue;
+			if (splash_mode || preview_mode) {
+				continue;
+			} else {
+				qr_mode = !qr_mode;
+				if (qr_mode) init_qr();
+				else exit_qr();
+				continue;
+			}
        }

        if (qr_mode) continue;