summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-12 22:17:14 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-12 22:17:14 +0100
commitb589a12d1765f8df616779c53e614adef2e4c48e (patch)
tree83cdd87d532a36df1177987547c57058fd4f1777 /gui/ConsoleWindow.cpp
parent498520446fcd10003226822f5ada9c2fe90e8c63 (diff)
parentfca4441229808891f460d5fbc4affd51e8896aa5 (diff)
downloadMultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar
MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.gz
MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.lz
MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.xz
MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.zip
Merge branch 'feature_better_launch' into develop
Diffstat (limited to 'gui/ConsoleWindow.cpp')
-rw-r--r--gui/ConsoleWindow.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index 84a141ce..54a74bde 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -166,6 +166,10 @@ void ConsoleWindow::on_closeButton_clicked()
void ConsoleWindow::setMayClose(bool mayclose)
{
+ if(mayclose)
+ ui->closeButton->setText(tr("Close"));
+ else
+ ui->closeButton->setText(tr("Hide"));
m_mayclose = mayclose;
}