Changeset 6125

Timestamp:

Mar 15, 2016, 12:58:21 PM (8 years ago)

Author:

ldelgass

Message:

merge r6123 from 1.5 branch (don't create photo if empty contents)

Location:

trunk

Files:

• . (modified) (1 prop)
• gui/scripts/drawingentry.tcl (modified) (2 diffs)

trunk/gui/scripts/drawingentry.tcl

@@ -578 +578 @@
         }
     }
-    set contents [XmlGetSubst $cpath.contents]
+    set contents [string trim [XmlGetSubst $cpath.contents]]
     set img ""
     if { [string compare -length 7 $contents "file://"] == 0 } {
@@ -602 +602 @@
         puts stderr  "don't know how to handle http"
         return
-    } else {
+    } elseif { $contents != "" } {
         set img [image create photo -data $contents]
     }
-    if {$img eq ""} {
+    if {$img == ""} {
         return
     }