← Back to branch summary

~ubuntu-branches/ubuntu/quantal/banshee/quantal

« back to all changes in this revision

Viewing changes to debian/patches/0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-04-20 23:34:40 UTC
  • mfrom: (6.4.23 sid)
  • Revision ID: package-import@ubuntu.com-20120420233440-g8br3wfrtxakwn5u
Tags: 2.4.0-2ubuntu1
* [980ad3d] Merge from Debian Unstable, remaining changes:
  + Enable and recommend SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector
  * [9b356d6] Add workaround for set_Height exception.
* [57afffa] Reexport patches via gbp-pq.
  The numbering of the Ubuntu specific patches have been upset due to the new
  patches imported into the previous Debian revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch
 
1
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
 
2
Date: Sat, 24 Mar 2012 12:27:06 +0100
 
3
Subject: UPnPServerSource: Fix crash when getting the root object
 
4
 (bgo#672744)
 
5
 
 
6
Move the GetRootObject () call inside the try/catch block, so that
 
7
exceptions from Mono.Upnp don't cause a crash.
 
8
 
 
9
Origin: commit:b627217e3841ca7d0b8af1ed8f916436e5088cee
 
10
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672744
 
11
---
 
12
 .../Banshee.UPnPClient/UPnPServerSource.cs         |    3 ++-
 
13
 1 file changed, 2 insertions(+), 1 deletion(-)
 
14
 
 
15
diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
 
16
index 04a743a..5412663 100644
 
17
--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
 
18
+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
 
19
@@ -124,10 +124,11 @@ namespace Banshee.UPnPClient
 
20
         {
 
21
             RemoteContentDirectory remote_dir = new RemoteContentDirectory (content_directory);
 
22
             DateTime begin = DateTime.Now;
 
23
-            Container root = remote_dir.GetRootObject ();
 
24
             bool recursive_browse = !content_directory.CanSearch;
 
25
 
 
26
             try {
 
27
+                Container root = remote_dir.GetRootObject ();
 
28
+
 
29
                 if (!recursive_browse) {
 
30
                     try {
 
31
                         Log.Debug ("Content directory is searchable, let's search");
 
32
--