ANDROID: fix back button regression

Author: chrisws

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.3])
+AC_INIT([smallbasic], [0.12.4])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

ide/android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="17"
-          android:versionName="0.12.3">
+          android:versionCode="18"
+          android:versionName="0.12.4">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9"/>
 

ide/android/assets/main.bas

@@ -55,7 +55,7 @@ sub do_about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.12.3"
+  print "Version 0.12.4"
   print
   print "Copyright (c) 2002-2015 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)

src/ui/system.cpp

@@ -631,22 +631,22 @@ void System::saveFile(TextEditInput *edit, strlib::String &path) {
 
 void System::setBack() {
   if (_userScreenId != -1) {
-    // restore user screen
+    // return (back) from user screen, (view source)
     _output->selectBackScreen(_userScreenId);
     _output->selectFrontScreen(_userScreenId);
     _userScreenId = -1;
-  }
-
-  // quit app when shell is active
-  setExit(_mainBas);
-
-  // follow history when available and not exiting
-  if (!_mainBas) {
-    // remove the current item
-    _history.pop();
-    if (_history.peek() != NULL) {
-      _loadPath.empty();
-      _loadPath.append(_history.peek());
+  } else {
+    // quit app when shell is active
+    setExit(_mainBas);
+
+    // follow history when available and not exiting
+    if (!_mainBas) {
+      // remove the current item
+      _history.pop();
+      if (_history.peek() != NULL) {
+        _loadPath.empty();
+        _loadPath.append(_history.peek());
+      }
     }
   }
 }