GH-1422 bump version to 0.4.10 and update changelog

This should fix wifi issues on Windows

application/CMakeLists.txt

@@ -6,7 +6,7 @@ set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
 ######## Set version numbers ########
 set(MultiMC_VERSION_MAJOR	 0)
 set(MultiMC_VERSION_MINOR	 4)
-set(MultiMC_VERSION_HOTFIX   8)
+set(MultiMC_VERSION_HOTFIX   10)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")

application/GuiUtil.cpp

@@ -13,7 +13,7 @@
 #include <DesktopServices.h>
 #include <BuildConfig.h>
 
-void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
+QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 {
 	ProgressDialog dialog(parentWidget);
 	auto APIKeySetting = MMC->settings()->get("PasteEEAPIKey").toString();
@@ -29,7 +29,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 			parentWidget, QObject::tr("Upload failed"),
 			QObject::tr("The log file is too big. You'll have to upload it manually."),
 			QMessageBox::Warning)->exec();
-		return;
+		return QString();
 	}
 
 	dialog.execWithTask(paste.get());
@@ -37,6 +37,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 	{
 		CustomMessageBox::selectable(parentWidget, QObject::tr("Upload failed"),
 									 paste->failReason(), QMessageBox::Critical)->exec();
+		return QString();
 	}
 	else
 	{
@@ -49,6 +50,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 						"the default "
 						"browser and placed in your clipboard.").arg(link),
 			QMessageBox::Information)->exec();
+		return link;
 	}
 }
 

application/GuiUtil.h

@@ -4,7 +4,7 @@
 
 namespace GuiUtil
 {
-void uploadPaste(const QString &text, QWidget *parentWidget);
+QString uploadPaste(const QString &text, QWidget *parentWidget);
 void setClipboardText(const QString &text);
 QStringList BrowseForFiles(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget);
 }

application/pages/LogPage.cpp

@@ -74,11 +74,22 @@ bool LogPage::shouldDisplay() const
 
 void LogPage::on_btnPaste_clicked()
 {
-	GuiUtil::uploadPaste(ui->text->toPlainText(), this);
+	//FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
+	write(tr("MultiMC: Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)), MessageLevel::MultiMC);
+	auto url = GuiUtil::uploadPaste(ui->text->toPlainText(), this);
+	if(!url.isEmpty())
+	{
+		write(tr("MultiMC: Log uploaded to: %1").arg(url), MessageLevel::MultiMC);
+	}
+	else
+	{
+		write(tr("MultiMC: Log upload failed!"), MessageLevel::Error);
+	}
 }
 
 void LogPage::on_btnCopy_clicked()
 {
+	write(QString("Clipboard copy at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)), MessageLevel::MultiMC);
 	GuiUtil::setClipboardText(ui->text->toPlainText());
 }
 

changelog.md

@@ -1,8 +1,52 @@
-# MultiMC 0.4.8
+# MultiMC 0.4.10
+
+Second hotfix for issues with wifi connections.
+
+## **IMPORTANT**
+
+- GH-1422: Huge ping spikes while using MultiMC
+
+  Another day, another fix. The bearer plugins added in 0.4.9 didn't really help and we ran into more bugs.
+
+  This time, the presence of the netowrk bearer plugins caused a lot of network lag for people on wifi connections.
+
+  Because this wasn't a problem on the previous version of Qt MultiMC used (5.4.2), I ended up reverting to that. This is a temporary solution until the Qt framework can be rebuilt and retested for every platform without this broken feature.
+
+  The upstream bug is [QTBUG-40332](https://bugreports.qt.io/browse/QTBUG-40332) and despite being closed, it is far from fixed.
+
+Because of the reverted Qt version, OSX 10.7 *might* work again. If it does, please do tell, it would help with figuring out what went wrong there :)
+
+# Previous releases
+
+## MultiMC 0.4.9
+
+Hotfix for issues with wifi connections.
+
+### **IMPORTANT**
+
+- GH-1408: MultiMC 0.4.8 doesn't work on wireless connections.
+
+  This is especially the case on Windows. If you already updated to 0.4.8, you will need to do a manual update, or use a wired connection to do the update.
+
+  The issue was caused by a change in the underlying framework (Qt), and MultiMC not including the network bearer plugins. This made it think that the connection is always down and not try to contact any servers because of that.
+
+  The upstream bug is [QTBUG-49267](https://bugreports.qt.io/browse/QTBUG-49267).
+
+- GH-1410: MultiMC crashes on launch on OS X 10.7.5
+
+  OSX 10.7.x is no longer supported by Apple and I do not have a system to test and fix this.
+
+  So, this is likely **NOT** going to be fixed - please update your OS if you are still running 10.7.
+
+### Improvements
+
+- GH-1362: When uploading or copying the Minecraft log, the action is logged, including a full timestamp.
+
+## MultiMC 0.4.8
 
 Fluffy and functional!
 
-## **IMPORTANT**
+### **IMPORTANT**
 
 - GH-1402: MultiMC will keep its binary filename after an update if you rename it.
 
@@ -13,7 +57,7 @@ Fluffy and functional!
   Future updates should no longer have this issue.
 
 
-## New features
+### New features
 
 - GH-1047, GH-1233: MultiMC now includes basic Minecraft world management.
 
@@ -35,7 +79,7 @@ Fluffy and functional!
 
 - GH-253, GH-1300: MultiMC can now be started with the `-l "Instance ID"` parameter, launching the specified instance directly.
 
-## Improvements
+### Improvements
 
 - Instance list
   - GH-1121: Instances are now selected after you create them.
@@ -101,7 +145,7 @@ Fluffy and functional!
 - Translations:
   - GH-1313: Some parts of the MultiMC user interface have been marked as 'not for translation'.
 
-## Internals and internal bug fixes
+### Internals and internal bug fixes
 
 - GH-1052: All the dependencies were rebuilt and the build environment upgraded to the latest compiler versions.
 - GH-1051: The CDPATH environment variable is now ignored.
@@ -124,8 +168,6 @@ Fluffy and functional!
 - GH-1266, GH-1301: Linux runner scripts has been improved.
 - GH-1360: Development and other unstable versions of MultiMC now uses github commits instead of this manually maintained changelog.
 
-# Previous releases
-
 ## 0.4.7
 
 This is what 0.4.6 should have been. Oh well, at least it's here now!

logic/launch/steps/PostLaunchCommand.cpp

@@ -34,20 +34,34 @@ void PostLaunchCommand::executeTask()
 
 void PostLaunchCommand::on_state(LoggedProcess::State state)
 {
+	auto getError = [&]()
+	{
+		return tr("Post-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
+	};
 	switch(state)
 	{
 		case LoggedProcess::Aborted:
 		case LoggedProcess::Crashed:
 		case LoggedProcess::FailedToStart:
 		{
-			QString error = tr("Post-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
-			emit logLine(error, MessageLevel::Error);
+			auto error = getError();
+			emit logLine(error, MessageLevel::Fatal);
 			emitFailed(error);
+			return;
 		}
 		case LoggedProcess::Finished:
 		{
-			emit logLine(tr("Post-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
-			emitSucceeded();
+			if(m_process.exitCode() != 0)
+			{
+				auto error = getError();
+				emit logLine(error, MessageLevel::Fatal);
+				emitFailed(error);
+			}
+			else
+			{
+				emit logLine(tr("Post-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
+				emitSucceeded();
+			}
 		}
 		default:
 			break;

logic/launch/steps/PreLaunchCommand.cpp

@@ -35,21 +35,34 @@ void PreLaunchCommand::executeTask()
 
 void PreLaunchCommand::on_state(LoggedProcess::State state)
 {
+	auto getError = [&]()
+	{
+		return tr("Pre-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
+	};
 	switch(state)
 	{
 		case LoggedProcess::Aborted:
 		case LoggedProcess::Crashed:
 		case LoggedProcess::FailedToStart:
 		{
-			QString error = tr("Pre-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
+			auto error = getError();
 			emit logLine(error, MessageLevel::Fatal);
 			emitFailed(error);
 			return;
 		}
 		case LoggedProcess::Finished:
 		{
-			emit logLine(tr("Pre-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
-			emitSucceeded();
+			if(m_process.exitCode() != 0)
+			{
+				auto error = getError();
+				emit logLine(error, MessageLevel::Fatal);
+				emitFailed(error);
+			}
+			else
+			{
+				emit logLine(tr("Pre-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
+				emitSucceeded();
+			}
 		}
 		default:
 			break;