summaryrefslogtreecommitdiff
path: root/fluid/proj/mergeback.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'fluid/proj/mergeback.cxx')
-rw-r--r--fluid/proj/mergeback.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/fluid/proj/mergeback.cxx b/fluid/proj/mergeback.cxx
index cef683f3e..34e4e1361 100644
--- a/fluid/proj/mergeback.cxx
+++ b/fluid/proj/mergeback.cxx
@@ -652,7 +652,9 @@ int mergeback_code_files(Project &proj, Mergeback::Feedback feedback)
Fl_Preferences path(build_records, proj_filename.c_str());
int i, n = (int)proj_filename.size();
for (i=0; i<n; i++) if (proj_filename[i]=='\\') proj_filename[i] = '/';
- path.get("code", code_filename, "");
+ char *code_fn_ptr = 0;
+ path.get("code", code_fn_ptr, "");
+ if (code_fn_ptr) { code_filename = code_fn_ptr; free(code_fn_ptr); }
}
#endif
if (code_filename.empty())