Changeset 4bad0a8038418a359af306aa505568561f0fc0ac

Timestamp:

09/18/10 19:30:36 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

7217c4f3d3ca45ca7950c5337d0f31e119484fed

Parents:

bb7abc0783e1e30e421daabbd1272084c4cadde9

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-09-18T19:30:36Z+0300

Message:

Properly handle saveas of automatic studios. Fix for #108

Files:

• daemon/cmd_save_studio.c (modified) (4 diffs)

daemon/cmd_save_studio.c

@@ -202 +202 @@
   struct stat st;
   struct ladish_write_context save_context;
+  bool renaming;
 
   ASSERT(cmd_ptr->command.state == LADISH_COMMAND_STATE_PENDING);
@@ -225 +226 @@
     goto exit;
   }
+
+  /* whether save will initiate a rename */
+  renaming = strcmp(cmd_ptr->studio_name, g_studio.name) != 0;
 
   if (g_studio.filename == NULL)
@@ -239 +243 @@
     old_filename = filename;
   }
-  else if (strcmp(cmd_ptr->studio_name, g_studio.name) == 0)
-  {
-    /* saving renamed studio */
+  else if (!renaming)
+  {
+    /* saving already renamed studio */
     old_filename = g_studio.filename;
     g_studio.filename = filename;
@@ -407 +411 @@
   ret = true;
 
-  if (old_filename == g_studio.filename && strcmp(g_studio.name, cmd_ptr->studio_name) != 0)
+  if (renaming)
   {
     free(g_studio.name);
     g_studio.name = cmd_ptr->studio_name;
-    cmd_ptr->studio_name = NULL;
-    ladish_studio_emit_renamed();
+    cmd_ptr->studio_name = NULL; /* mark that descructor does not need to free the new name buffer */
+    ladish_studio_emit_renamed(); /* uses g_studio.name */
   }