Merge branch 'master' into jgrpp

2017-07-27 18:41:43 +01:00
parent 103cabb178 bf3fd277c1
commit 52dadc9252
5 changed files with 37 additions and 38 deletions
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -128,7 +128,7 @@ struct EnginePreviewWindow : Window {
 				DoCommandP(0, this->window_number, 0, CMD_WANT_ENGINE_PREVIEW);
 				/* FALL THROUGH */
 			case WID_EP_NO:
-				delete this;
+				if (!_shift_pressed) delete this;
 				break;
 		}
 	}