Minor refactoring

Prevent creating a screen-less PendingAction with invalid type.

diff --git a/src/screen.cc b/src/screen.cc
index c37ff9d868ff11587c1a0438390a7a9939846842..df17293a27e2b22e019b5847fc18db47020456d5 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -14,7 +14,21 @@ Screen::Screen(std::weak_ptr<ScreenStack> stack) : stack(stack) {}
 ScreenStack::PendingAction::PendingAction() : screen(), action(Action::NOP) {}
 
 ScreenStack::PendingAction::PendingAction(Action action)
-    : screen(), action(action) {}
+    : screen(), action(action) {
+  switch (action) {
+    case Action::PUSH_SCREEN:
+    case Action::CONSTRUCT_SCREEN:
+      // Cannot push non-existant screen.
+      this->action = Action::NOP;
+#ifndef NDEBUG
+      std::clog << "WARNING: Cannot create PendingAction with PUSH_SCREEN or "
+                   "CONSTRUCT_SCREEN!\n";
+#endif
+      break;
+    default:
+      break;
+  }
+}
 
 ScreenStack::PendingAction::PendingAction(Screen::Ptr &&screen)
     : screen(std::forward<Screen::Ptr>(screen)), action(Action::PUSH_SCREEN) {}