aboutsummaryrefslogtreecommitdiff
path: root/ui-diff.c
diff options
context:
space:
mode:
authorTim Chen <timchen1@gmail.com>2012-01-03 16:09:59 +0000
committerLars Hjemli <hjemli@gmail.com>2012-01-03 16:09:59 +0000
commit195742572681d6c2583de392131d1be86ef52f48 (patch)
treeff02d05e91dccefefab3ffa5b34b099b0e6f7f21 /ui-diff.c
parent04254fa903701943bd45a479a952cc213a5b112a (diff)
downloadcgit-195742572681d6c2583de392131d1be86ef52f48.tar.gz
cgit-195742572681d6c2583de392131d1be86ef52f48.tar.bz2
cgit-195742572681d6c2583de392131d1be86ef52f48.zip
ui-ssdiff.c: set correct diffmode in "control panel"
When side-by-side-diffs=1 was set in cgitrc, specifying 'ss=0' in the querystring would not set the 'unified' option as active in the dropdown box used to select diffmode.
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c
index af24a6c..c6bad63 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -341,9 +341,7 @@ void cgit_print_diff_ctrls()
html("<td class='label'>mode:</td>");
html("<td class='ctrl'>");
html("<select name='ss' onchange='this.form.submit();'>");
- curr = ctx.qry.ssdiff;
- if (!curr && ctx.cfg.ssdiff)
- curr = 1;
+ curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
html_intoption(0, "unified", curr);
html_intoption(1, "ssdiff", curr);
html("</select></td></tr>");