Merge branch 'stable'

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index d97a8012cfffc4d10986c27d3f3a6f7bfa4019fd..af24a6c4ccffa1520f383748f574dd87d0945b52 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -395,8 +395,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                }
        }
 
-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               use_ssdiff = 1;
+       use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
 
        if (show_ctrls)
                cgit_print_diff_ctrls();