dm 7 years ago
parent
commit
ddc85225f4
2 changed files with 15 additions and 4 deletions
  1. 12 4
      src/flow/flow.cpp
  2. 3 0
      src/flow/flow.h

+ 12 - 4
src/flow/flow.cpp

@@ -42,6 +42,9 @@ namespace oxygine
             _back = false;
             _back = false;
             _locked = false;
             _locked = false;
 
 
+            _quitLast = false;
+            _autoQuit = true;
+
 
 
             _tm = 0;
             _tm = 0;
             _wasTouchBlocked = false;
             _wasTouchBlocked = false;
@@ -383,14 +386,16 @@ namespace oxygine
                 }
                 }
             }
             }
 
 
+            
             bool quit = checkQuit();
             bool quit = checkQuit();
-            static bool quitLast = false;
-            if (quit && !quitLast)
+
+            if (quit && !_quitLast)
             {
             {
                 _wasBackBlocked = true;
                 _wasBackBlocked = true;
                 _wasTouchBlocked = false;
                 _wasTouchBlocked = false;
             }
             }
-            quitLast = quit;
+            _quitLast = quit;
+        
 
 
             if (_transition)
             if (_transition)
             {
             {
@@ -431,7 +436,10 @@ namespace oxygine
             }
             }
 
 
             if (scenes.empty())
             if (scenes.empty())
-                core::requestQuit();
+            {
+                if (_autoQuit)
+                    core::requestQuit();
+            }
         }
         }
 
 
         void update()
         void update()

+ 3 - 0
src/flow/flow.h

@@ -76,12 +76,15 @@ namespace oxygine
             spScene _next;
             spScene _next;
 
 
 
 
+            bool _autoQuit;
+
             spActor _touchBlocker;
             spActor _touchBlocker;
 
 
             Vector2 _blockedTouchPosition;
             Vector2 _blockedTouchPosition;
             bool _wasTouchBlocked;
             bool _wasTouchBlocked;
             bool _wasBackBlocked;
             bool _wasBackBlocked;
             timeMS _tm;
             timeMS _tm;
+            bool _quitLast;
         };
         };
     }
     }
 }
 }