summarylogtreecommitdiffstats
path: root/fix-second-instance-crash.patch
blob: df2571d116164caafe1627d576e8048d832bb33e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- bin/shutter	2017-01-04 10:56:38.404752277 +0100
+++ bin/shutter-fixed	2017-01-04 11:15:49.794702540 +0100
@@ -322,6 +322,12 @@
 
     #send $cmdid
     if ( defined $cmdid && defined $extra ) {
+        if (!$extra) {
+            # Quick fix to avoid segmentation fault in some environments.
+
+            $extra = "text=>null";
+        }
+    
         $app->send_message( $cmdid, text => $extra );
     }
     elsif ( defined $cmdid ) {
@@ -487,7 +493,13 @@
                     #take screenshot
                 }
                 else {
-                    &evt_take_screenshot( 'global_keybinding', $cmd, undef, $message->get_text );
+                    my $extra = $message->get_text;
+                    
+                    if ( $extra eq "text=>null" ) {
+                        $extra = '';
+                    }
+                
+                    &evt_take_screenshot( 'global_keybinding', $cmd, undef, $extra );
                 }
             }
 
@@ -11334,3 +11346,4 @@
 B<https://bugs.launchpad.net/shutter/+filebug>
 
 =cut
+