gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FLUID: minor fixes

Browse Source
This commit is contained in:
Matthias Melcher 2023-09-27 12:57:12 +02:00
parent c073c1fca7
commit e68f5e6c42
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fluid/fluid.cxx
View File

@ -319,6 +319,8 @@ void Fluid_Project::reset() {
void Fluid_Project::update_settings_dialog() {
if (settings_window) {
w_settings_project_tab->do_callback(w_settings_project_tab, LOAD);
w_settings_layout_tab->do_callback(w_settings_layout_tab, LOAD);
w_settings_shell_tab->do_callback(w_settings_shell_tab, LOAD);
w_settings_i18n_tab->do_callback(w_settings_i18n_tab, LOAD);
}
}
@ -1055,15 +1057,14 @@ bool merge_project_file(const Fl_String &filename_arg) {
widget_browser->rebuild();
if (is_a_merge) {
// Inserting a file; restore the original filename...
free((void *)filename);
filename = oldfilename;
set_filename(oldfilename);
set_modflag(1);
} else {
// Loaded a file; free the old filename...
set_modflag(0, 0);
undo_clear();
if (oldfilename) free((void *)oldfilename);
}
if (oldfilename) free((void *)oldfilename);
g_project.update_settings_dialog();
return true;
}