Reset viewport in title_screen after leaving editor, not in editor.

This fixes some issues where the viewport wouldn't get scaled back down because
it'd show the unsaved changes dialog.

Signed-off-by: Swagtoy <me@ow.swag.toys>

Author: swagtoy

src/editor/editor.cpp

@@ -937,10 +937,6 @@ Editor::quit_editor()
   check_unsaved_changes([quit] {
     quit();
   });
-
-  // reset viewport to how it was
-  if (VideoSystem::current())
-    VideoSystem::current()->get_viewport().force_full_viewport(g_config->max_viewport);
 }
 
 bool

src/supertux/title_screen.cpp

@@ -63,17 +63,31 @@ TitleScreen::TitleScreen(Savegame& savegame, bool christmas) :
   m_copyright_text(),
   m_videosystem_name(VideoSystem::current()->get_name()),
   m_logo_opacity(1.0),
-  m_jump_was_released(false)
+  m_jump_was_released(false),
+  m_fully_initialized(false)
 {
   refresh_copyright_text();
 }
 
 void
 TitleScreen::setup()
 {
+  // In cases where the editor leaves, we want to ensure the viewport is reset
+  // here, just to ensure that there will never be a case where there is a
+  // partial viewport restoration. Just to be extra safe (no extra apply_config
+  // calls) we only do this when setup is called again (usually after leaving
+  // the game/editor), not on first initialization (because then we'd call
+  // apply_config twice...)
+  if (m_fully_initialized)
+  {
+    VideoSystem::current()->get_viewport().force_full_viewport(g_config->max_viewport);
+  }
+
   refresh_level();
   MenuManager::instance().set_menu(MenuStorage::MAIN_MENU);
   ScreenManager::current()->set_screen_fade(std::make_unique<FadeToBlack>(FadeToBlack::FADEIN, 0.25f));
+
+  m_fully_initialized = true;
 }
 
 void

src/supertux/title_screen.hpp

@@ -74,6 +74,7 @@ class TitleScreen final : public Screen,
   /* Not a timer because the user could flip back and forth constantly */
   float m_logo_opacity;
   bool m_jump_was_released;
+  bool m_fully_initialized;
 
 private:
   TitleScreen(const TitleScreen&) = delete;