diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-14 01:11:52 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-14 01:11:52 +0200 |
| commit | 8bb906bbd763e7dd78010514f393e88e3d3fa393 (patch) | |
| tree | 68c2ce37bfd27563b3284f5078d8691b7595b41f | |
| parent | e7f67a73b3a6986c63e768457b214292e173c189 (diff) | |
| download | MultiMC-8bb906bbd763e7dd78010514f393e88e3d3fa393.tar MultiMC-8bb906bbd763e7dd78010514f393e88e3d3fa393.tar.gz MultiMC-8bb906bbd763e7dd78010514f393e88e3d3fa393.tar.lz MultiMC-8bb906bbd763e7dd78010514f393e88e3d3fa393.tar.xz MultiMC-8bb906bbd763e7dd78010514f393e88e3d3fa393.zip | |
Fix last minute derps
* Changelog formatting
* Update dialog popping up on start even when it shouldn't
| -rw-r--r-- | changelog.md | 10 | ||||
| -rw-r--r-- | gui/MainWindow.cpp | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/changelog.md b/changelog.md index dd42152d..97047636 100644 --- a/changelog.md +++ b/changelog.md @@ -3,15 +3,15 @@ ##0.4.0 - Jar support in 1.6+ - Deprecated legacy instances - - Legacy instances can still be used but not created - - All Minecraft versions are supported in the new instance format + - Legacy instances can still be used but not created + - All Minecraft versions are supported in the new instance format - All instance editing and settings dialogs were turned into pages - - The edit instance dialog contains pages relevant to editing and settings - - The console window contains pages useful when playing the game + - The edit instance dialog contains pages relevant to editing and settings + - The console window contains pages useful when playing the game - Redone the screenshot management and upload (page) - Added a way to display and manage log files and crash reports generated by Minecraft (page) - Added measures to prevent corruption of version files - - Minecraft version files are no longer part of the instances by default + - Minecraft version files are no longer part of the instances by default - Added help for the newly added dialog pages - Made logs uploaded to paste.ee expire after a month - Fixed a few bugs related to liteloader and forge (1.7.10 issues) diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 552f6a2d..1a92139c 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -309,7 +309,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi &MainWindow::updateNotAvailable); // if automatic update checks are allowed, start one. if (MMC->settings()->get("AutoUpdate").toBool()) - on_actionCheckUpdate_triggered(); + { + auto updater = MMC->updateChecker(); + updater->checkForUpdate(false); + } connect(MMC->notificationChecker().get(), &NotificationChecker::notificationCheckFinished, this, @@ -931,7 +934,6 @@ void MainWindow::on_actionConfig_Folder_triggered() void MainWindow::on_actionCheckUpdate_triggered() { auto updater = MMC->updateChecker(); - updater->checkForUpdate(true); } |