main menu cancels quit visualizations

2020-03-08 00:59:42 +01:00 · 2020-03-08 00:59:42 +01:00 · 13c807c938
parent cf968c8be1
commit 13c807c938
2 changed files with 3 additions and 2 deletions
--- a/menus.cpp
+++ b/menus.cpp
@ -207,6 +207,7 @@ EX void showOverview() {
 // -- main menu --

 EX void showMainMenu() {
+  cancel(); cancel = noaction;
  gamescreen(2);

  getcstat = ' ';
--- a/quit.cpp
+++ b/quit.cpp
@ -36,9 +36,9 @@ string timeline() {
      XLAT("%1 turns (%2)", its(turncount), getgametime_s());
  }

-void noaction() {}
+EX void noaction() {}

-function<void()> cancel = noaction;
+EX function<void()> cancel = noaction;

 #if HDR
 struct hint {