diff options
| -rw-r--r-- | gui/ConsoleWindow.cpp | 5 | ||||
| -rw-r--r-- | gui/ConsoleWindow.h | 2 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftVersion.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp index 467008b6..01c1514a 100644 --- a/gui/ConsoleWindow.cpp +++ b/gui/ConsoleWindow.cpp @@ -55,6 +55,7 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent) : QMainWindow(parent), m_proc(mcproc) { MultiMCPlatform::fixWM_CLASS(this); + setAttribute(Qt::WA_DeleteOnClose); auto instance = m_proc->instance(); auto icon = MMC->icons()->getIcon(instance->iconKey()); @@ -263,3 +264,7 @@ void ConsoleWindow::onLaunchFailed(InstancePtr instance) if (!isVisible()) show(); } +ConsoleWindow::~ConsoleWindow() +{ + +} diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h index 97600baa..1b086f1a 100644 --- a/gui/ConsoleWindow.h +++ b/gui/ConsoleWindow.h @@ -27,7 +27,7 @@ class ConsoleWindow : public QMainWindow public: explicit ConsoleWindow(MinecraftProcess *proc, QWidget *parent = 0); - virtual ~ConsoleWindow() {}; + virtual ~ConsoleWindow(); /** * @brief specify if the window is allowed to close diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp index 939c1149..bd53997b 100644 --- a/logic/minecraft/MinecraftVersion.cpp +++ b/logic/minecraft/MinecraftVersion.cpp @@ -147,7 +147,7 @@ QString MinecraftVersion::getPatchFilename() bool MinecraftVersion::needsUpdate() { auto settings = MMC->settings(); - bool result = hasUpdate() && settings->get("AutoUpdateMinecraftVersions").toBool(); + bool result = m_versionSource == Remote || (hasUpdate() && settings->get("AutoUpdateMinecraftVersions").toBool()); return result; } |