obs-studio: use upstream crash fixes, drop patch

This commit is contained in:
Cray Elliott 2017-03-25 21:07:09 -07:00
parent 7793669ec9
commit 7bd73bdba3
2 changed files with 2 additions and 44 deletions

View file

@ -27,12 +27,10 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6";
rev = "624aa2a5";
sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
};
patches = [ ./segfault-patch-systray.patch ];
nativeBuildInputs = [ cmake
];

View file

@ -1,40 +0,0 @@
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