From d044c05f30cd6c7591c5ec03b310253fdc06d7d1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 22 Jan 2020 18:19:43 -0800
Subject: [PATCH] Qt: Only dynamically reset video scale if a game is running

---
 CHANGES                       | 4 ++++
 src/platform/qt/DisplayGL.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7aac48d61..f78fd6a24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.9.0: (Future)
+Other fixes:
+ - Qt: Only dynamically reset video scale if a game is running
+
 0.8.0: (2020-01-21)
 Features:
  - Improved logging configuration
diff --git a/src/platform/qt/DisplayGL.cpp b/src/platform/qt/DisplayGL.cpp
index 9de39ae86..3cb5bb8c9 100644
--- a/src/platform/qt/DisplayGL.cpp
+++ b/src/platform/qt/DisplayGL.cpp
@@ -356,8 +356,10 @@ void PainterGL::resizeContext() {
 		return;
 	}
 
-	mCore* core = m_context->thread()->core;
-	core->reloadConfigOption(core, "videoScale", NULL);
+	if (m_started) {
+		mCore* core = m_context->thread()->core;
+		core->reloadConfigOption(core, "videoScale", NULL);
+	}
 
 	QSize size = m_context->screenDimensions();
 	m_backend->setDimensions(m_backend, size.width(), size.height());