summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-14 02:36:03 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-14 02:36:03 +0200
commitdd8eacee1b28ca40f8dc770587d111656d92d5fb (patch)
tree152e671cbb9ad23ce8966a23e752423ace7d8b82 /application
parente38cc1d480fdcf3ad08829688fe1a61961612e36 (diff)
downloadMultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.gz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.lz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.xz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.zip
GH-1227 renam GZip functions to not collide with zlib macros
Diffstat (limited to 'application')
-rw-r--r--application/pages/OtherLogsPage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/pages/OtherLogsPage.cpp b/application/pages/OtherLogsPage.cpp
index b3481bfb..74257a83 100644
--- a/application/pages/OtherLogsPage.cpp
+++ b/application/pages/OtherLogsPage.cpp
@@ -130,7 +130,7 @@ void OtherLogsPage::on_btnReload_clicked()
if(file.fileName().endsWith(".gz"))
{
QByteArray temp;
- if(!GZip::decompress(file.readAll(), temp))
+ if(!GZip::unzip(file.readAll(), temp))
{
ui->text->setPlainText(
tr("The file (%1) is not readable.").arg(file.fileName()));