1 files changed, 11 insertions, 8 deletions

diff --git a/ui-shared.c b/ui-shared.c
index cf06511..07d5dd4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -601,72 +601,75 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 	}
 
 	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
 	    strcmp(ctx.qry.head, ctx.repo->defbranch))
 		html_hidden("h", ctx.qry.head);
 
 	if (ctx.qry.sha1)
 		html_hidden("id", ctx.qry.sha1);
 	if (ctx.qry.sha2)
 		html_hidden("id2", ctx.qry.sha2);
 	if (ctx.qry.showmsg)
 		html_hidden("showmsg", "1");
 
 	if (incl_search) {
 		if (ctx.qry.grep)
 			html_hidden("qt", ctx.qry.grep);
 		if (ctx.qry.search)
 			html_hidden("q", ctx.qry.search);
 	}
 }
 
 const char *fallback_cmd = "repolist";
 
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
 	return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
 static void print_header(struct cgit_context *ctx)
 {
 	html("<table id='header'>\n");
 	html("<tr>\n");
-	html("<td class='logo' rowspan='2'><a href='");
-	if (ctx->cfg.logo_link)
-		html_attr(ctx->cfg.logo_link);
-	else
-		html_attr(cgit_rooturl());
-	html("'><img src='");
-	html_attr(ctx->cfg.logo);
-	html("' alt='cgit logo'/></a></td>\n");
+
+	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+		html("<td class='logo' rowspan='2'><a href='");
+		if (ctx->cfg.logo_link)
+			html_attr(ctx->cfg.logo_link);
+		else
+			html_attr(cgit_rooturl());
+		html("'><img src='");
+		html_attr(ctx->cfg.logo);
+		html("' alt='cgit logo'/></a></td>\n");
+	}
 
 	html("<td class='main'>");
 	if (ctx->repo) {
 		cgit_index_link("index", NULL, NULL, NULL, 0);
 		html(" : ");
 		cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
 		html("</td><td class='form'>");
 		html("<form method='get' action=''>\n");
 		cgit_add_hidden_formfields(0, 1, ctx->qry.page);
 		html("<select name='h' onchange='this.form.submit();'>\n");
 		for_each_branch_ref(print_branch_option, ctx->qry.head);
 		html("</select> ");
 		html("<input type='submit' name='' value='switch'/>");
 		html("</form>");
 	} else
 		html_txt(ctx->cfg.root_title);
 	html("</td></tr>\n");
 
 	html("<tr><td class='sub'>");
 	if (ctx->repo) {
 		html_txt(ctx->repo->desc);
 		html("</td><td class='sub right'>");
 		html_txt(ctx->repo->owner);
 	} else {
 		if (ctx->cfg.root_desc)
 			html_txt(ctx->cfg.root_desc);
 		else if (ctx->cfg.index_info)
 			html_include(ctx->cfg.index_info);
 	}
 	html("</td></tr></table>\n");
 }