jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash on logger; make log window modalless (#2659)

Browse source
This commit is contained in:
ctrlaltca 2017-04-26 21:05:24 +02:00 • committed by Zach H
parent 9dd3a04a08
commit ce77d51a8f
6 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/window_main.cpp
View file

@ -314,8 +314,13 @@ void MainWindow::actUpdate()
void MainWindow::actViewLog()
{
DlgViewLog dlg(this);
dlg.exec();
if (logviewDialog == nullptr) {
logviewDialog = new DlgViewLog(this);
}
logviewDialog->show();
logviewDialog->raise();
logviewDialog->activateWindow();
}
void MainWindow::serverTimeout()
@ -652,7 +657,7 @@ void MainWindow::createMenus()
}
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), localServer(0), bHasActivated(false), cardUpdateProcess(0)
: QMainWindow(parent), localServer(0), bHasActivated(false), cardUpdateProcess(0), logviewDialog(0)
{
connect(settingsCache, SIGNAL(pixmapCacheSizeChanged(int)), this, SLOT(pixmapCacheSizeChanged(int)));
pixmapCacheSizeChanged(settingsCache->getPixmapCacheSize());