mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-16 04:28:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 5968119c61 a5bb527ce5
commit 64f3b29e02
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()