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

Fix missing return in mergeback

Browse Source
This commit is contained in:
Matthias Melcher 2026-01-04 22:35:20 +01:00
parent 8d714acf33
commit 296f2fc5da
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fluid/proj/mergeback.cxx
View File

@ -613,14 +613,15 @@ int Mergeback::merge_back(const std::string &s, const std::string &p, Task task)
files with the project file. If MergeBack is not enabled, it displays
a message to the user. It handles both batch and interactive modes.
\return int - Returns 1 if the project filename is not available,
0 if MergeBack is not enabled,
or the result of the merge_back function.
\return 2 if mergeback is called recursively
\return 1 if the project filename is not available
\return 0 if MergeBack is not enabled, or the result of the merge_back function.
\see Mergeback::merge_back(const std::string &s, const std::string &p, Task task)
*/
int mergeback_code_files(Project &proj, Mergeback::Feedback feedback)
{
static bool recursion_lock = false;
if (recursion_lock) return;
if (recursion_lock) return 2;
recursion_lock = true;
Fluid.flush_text_widgets();