gnome-commander r1539 - in branches/gcmd-1-3: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Jan 21 21:08:40 2008
New Revision: 1539
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1539&view=rev

Log:
Fixed problem #510567 (failed assert when deleting dir)

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/doc/C/gnome-commander.xml
   branches/gcmd-1-3/src/gnome-cmd-dir.cc

Modified: branches/gcmd-1-3/doc/C/gnome-commander.xml
==============================================================================
--- branches/gcmd-1-3/doc/C/gnome-commander.xml	(original)
+++ branches/gcmd-1-3/doc/C/gnome-commander.xml	Mon Jan 21 21:08:40 2008
@@ -5656,6 +5656,9 @@
                             <para>Fixed problem #508565 (improper utf-8 handling in advanced file rename tool)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #510567 (failed assert when deleting dir)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem when creating ~/dir</para>
                         </listitem>
                         <listitem>

Modified: branches/gcmd-1-3/src/gnome-cmd-dir.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-dir.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-dir.cc	Mon Jan 21 21:08:40 2008
@@ -780,7 +780,8 @@
 
     GnomeCmdFile *finfo = gnome_cmd_file_collection_lookup (dir->priv->file_collection, uri_str);
 
-    g_return_if_fail (GNOME_CMD_IS_FILE (finfo));
+    if (!GNOME_CMD_IS_FILE (finfo))
+        return;
 
     gtk_signal_emit (GTK_OBJECT (dir), dir_signals[FILE_DELETED], finfo);