pool/kaffeine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 107423 from KDE:Distro:Factory

Browse Source 
fix crash on resume (forwarded request 107421 from jirislaby)

OBS-URL: https://build.opensuse.org/request/show/107423
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=46
This commit is contained in:
Stephan Kulow 2012-02-29 13:08:01 +00:00 committed by Git OBS Bridge
parent 2d81624da1
commit d32d64831c
3 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crash-on-resume-fix.patch Normal file
View File

@ -0,0 +1,31 @@
---
src/dvb/dvbmanager.cpp | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
--- a/src/dvb/dvbmanager.cpp
+++ b/src/dvb/dvbmanager.cpp
@@ -448,15 +448,17 @@ void DvbManager::deviceAdded(DvbBackendD
void DvbManager::deviceRemoved(DvbBackendDevice *backendDevice)
{
for (int i = 0; i < deviceConfigs.size(); ++i) {
- if (deviceConfigs.at(i).device->getBackendDevice() == backendDevice) {
- if (deviceConfigs[i].useCount != 0) {
- deviceConfigs[i].useCount = 0;
- deviceConfigs[i].prioritizedUseCount = 0;
- deviceConfigs[i].device->release();
+ DvbDeviceConfig &it = deviceConfigs[i];
+
+ if (it.device && it.device->getBackendDevice() == backendDevice) {
+ if (it.useCount != 0) {
+ it.useCount = 0;
+ it.prioritizedUseCount = 0;
+ it.device->release();
}
- delete deviceConfigs[i].device;
- deviceConfigs[i].device = NULL;
+ delete it.device;
+ it.device = NULL;
break;
}
}

5
kaffeine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 28 11:27:56 CET 2012 - jslaby@suse.de
- fix crash on resume
-------------------------------------------------------------------
Thu Oct 27 00:10:17 UTC 2011 - fisiu@opensuse.org

13
kaffeine.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kaffeine
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,17 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: kaffeine
Version: 1.2.2
Release: 1
Release: 0
Summary: Xine-Based Multimedia Player
License: GPL-2.0+
Url: http://kaffeine.kde.org/
Group: Productivity/Multimedia/Video/Players
Url: http://kaffeine.kde.org/
# http://sourceforge.net/projects/kaffeine/files/current/kaffeine-1.2.2.tar.gz
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-icons.tar.bz2
@ -39,6 +37,8 @@ Patch3: initial-preference.diff
Patch4: build-fix.diff
# PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support audio/webm and video/x-theora+ogg
Patch5: support_mimetypes_bnc671581.diff
# PATCH-FIX-UPSTREAM
Patch6: crash-on-resume-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libkde4-devel
@ -70,6 +70,7 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
%if 0%{?suse_version} > 1130
%patch5
%endif
%patch6 -p1
%build
%cmake_kde4 -d build