diff options
| author | Matthias Melcher <github@matthiasm.com> | 2023-10-26 03:19:05 +0200 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2023-10-26 03:19:05 +0200 |
| commit | f33dfc1c6a2c4af2f463cbece4ca6eff2d1575ae (patch) | |
| tree | 9211dfcb2133716fc518bc534ecf5810462b4ef4 | |
| parent | 6d5021c00e71db7d0bc36c8622cb256fd5088cd6 (diff) | |
FLUID: Adds helpful message for MergeBack.
| -rw-r--r-- | fluid/fluid.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index a800c95b7..eaaaa53f0 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1277,6 +1277,12 @@ int mergeback_code_files() { flush_text_widgets(); if (!filename) return 1; + if (!g_project.write_mergeback_data) { + fl_message("MergeBack is not enabled for this project.\n" + "Please enable MergeBack in the project settings\n" + "dialog and re-save the project file and the code."); + return 0; + } // -- generate the file names with absolute paths Fd_Code_Writer f; @@ -1288,6 +1294,7 @@ int mergeback_code_files() if (!batch_mode) leave_project_dir(); if (c==0) fl_message("MergeBack found no external modifications\n" "in the source code."); + return c; } void mergeback_cb(Fl_Widget *, void *) { |