diff options
author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /logic/net/PasteUpload.cpp | |
parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
download | MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.lz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.xz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
Diffstat (limited to 'logic/net/PasteUpload.cpp')
-rw-r--r-- | logic/net/PasteUpload.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index acf09291..fa54d084 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -78,7 +78,9 @@ bool PasteUpload::parseResult(QJsonDocument doc, QString *parseError) parseError = new QString(object.value("error").toString()); return false; } + // FIXME: not the place for GUI things. QString pasteUrl = object.value("paste").toObject().value("link").toString(); QDesktopServices::openUrl(pasteUrl); return true; } + |