From b9796c86ba1c100b82e932ea9069a44561875bb1 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 23 Jul 2018 23:38:30 +0200
Subject: [PATCH] tour:: ENTER/BACKSPACE now checks whether a subgame is one
 with gamestack::pushed(), not with geometry || nonbitrunc (more general)

---
 tour.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tour.cpp b/tour.cpp
index fdc4b919..cca2e034 100644
--- a/tour.cpp
+++ b/tour.cpp
@@ -90,7 +90,7 @@ bool handleKeyTour(int sym, int uni) {
   int flags = slides[currentslide].flags;
   if((sym == SDLK_RETURN || sym == SDLK_KP_ENTER) && (!inhelp || (flags & QUICKSKIP))) {
     popScreenAll();
-    if(geometry || nonbitrunc) { 
+    if(gamestack::pushed()) { 
       return_geometry();
       if(!(flags & QUICKGEO)) return true; 
       }
@@ -102,7 +102,7 @@ bool handleKeyTour(int sym, int uni) {
     return true;
     }
   if(sym == SDLK_BACKSPACE) {
-    if(geometry || nonbitrunc) { 
+    if(gamestack::pushed()) { 
       pop_game();
       if(!(flags & QUICKGEO)) return true;
       }