Code merge fixes

* Corrections fl_digi.cxx and logger.cxx

src/dialogs/fl_digi.cxx

@@ -4069,7 +4069,7 @@ void LOGBOOK_colors_font()
 	int newheight = 24 + 4*(wh + 20) + 3*wh + 4 + bNewSave->h() + 4 + wBrowser->h() + 2;
 
 	if (dlg_width > progStatus.logbook_w)
-		logbook_w = dlg_width;
+		progStatus.logbook_w = dlg_width;
 	else
 		dlg_width = progStatus.logbook_w;
 	if (newheight > progStatus.logbook_h)

src/logger/logger.cxx

@@ -148,6 +148,7 @@ static void send_IPC_log(cQsoRec &rec)
 
 	int mm, dd, yyyy;
 	char szdate[9];
+	char sztime[5];
 	strncpy(szdate, rec.getField(QSO_DATE_OFF), 8);
 	szdate[8] = 0;
 	sscanf(&szdate[6], "%d", &dd); szdate[6] = 0;