4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4678 from cg2121/logviewer-fixes

Browse source 
UI: Log viewer fixes
This commit is contained in:
Richard Stanway 2021-08-21 21:59:05 +02:00 • committed by GitHub
commit 64f3b29e02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
UI/window-basic-main.cpp
View file

@ -2096,11 +2096,8 @@ void OBSBasic::OnFirstLoad()
bool showLogViewerOnStartup = config_get_bool(
App()->GlobalConfig(), "LogViewer", "ShowLogStartup");
if (showLogViewerOnStartup) {
if (!logView)
logView = new OBSLogViewer();
logView->show();
}
if (showLogViewerOnStartup)
on_actionViewCurrentLog_triggered();
}
void OBSBasic::DeferredSysTrayLoad(int requeueCount)
@ -2585,7 +2582,6 @@ OBSBasic::~OBSBasic()
updateCheckThread->wait();
delete screenshotData;
delete logView;
delete multiviewProjectorMenu;
delete previewProjector;
delete studioProgramProjector;
@ -5938,15 +5934,12 @@ void OBSBasic::on_actionViewCurrentLog_triggered()
if (!logView)
logView = new OBSLogViewer();
if (!logView->isVisible()) {
logView->setVisible(true);
} else {
logView->setWindowState(
(logView->windowState() & ~Qt::WindowMinimized) |
Qt::WindowActive);
logView->activateWindow();
logView->raise();
}
logView->show();
logView->setWindowState(
(logView->windowState() & ~Qt::WindowMinimized) |
Qt::WindowActive);
logView->activateWindow();
logView->raise();
}
void OBSBasic::on_actionShowCrashLogs_triggered()