Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
also add patch to fix a segfault, submitted upstream to obs-studio
- Loading branch information
Cray Elliott
authored and
Cray Elliott
committed
Mar 10, 2017
1 parent
1873721
commit 76836ee
Showing
2 changed files
with
44 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
pkgs/applications/video/obs-studio/segfault-patch-systray.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| From c31e0f682431508ccd2d3c0f74e6e16fc71445d8 Mon Sep 17 00:00:00 2001 | ||
| From: Cray Elliott <MP2E@archlinux.us> | ||
| Date: Fri, 10 Mar 2017 03:48:36 -0800 | ||
| Subject: [PATCH] Fix segfault in Linux when no system tray exists | ||
|
|
||
| previously, switching workspaces while obs-studio is running resulted in a | ||
| segfault if no system tray was available | ||
| --- | ||
| UI/window-basic-main.cpp | 16 +++++++++------- | ||
| 1 file changed, 9 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp | ||
| index 8590dd75..024854d6 100644 | ||
| --- a/UI/window-basic-main.cpp | ||
| +++ b/UI/window-basic-main.cpp | ||
| @@ -2916,13 +2916,15 @@ void OBSBasic::closeEvent(QCloseEvent *event) | ||
|
|
||
| void OBSBasic::changeEvent(QEvent *event) | ||
| { | ||
| - if (event->type() == QEvent::WindowStateChange && | ||
| - isMinimized() && | ||
| - trayIcon->isVisible() && | ||
| - sysTrayMinimizeToTray()) { | ||
| - | ||
| - ToggleShowHide(); | ||
| - } | ||
| + if (trayIcon) { | ||
| + if (event->type() == QEvent::WindowStateChange && | ||
| + isMinimized() && | ||
| + trayIcon->isVisible() && | ||
| + sysTrayMinimizeToTray()) { | ||
| + | ||
| + ToggleShowHide(); | ||
| + } | ||
| + } | ||
| } | ||
|
|
||
| void OBSBasic::on_actionShow_Recordings_triggered() | ||
| -- | ||
| 2.12.0 |