From 41f218316dce6b1bfcfb0f2754379fa74c5138ed Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Oct 2013 14:35:34 +0000 Subject: warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@6534 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/msglog.cpp | 5 +---- plugins/Scriver/src/msgtimedout.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 2aebe789e0..d36c982b8e 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -367,10 +367,7 @@ static char *CreateRTFHeader(struct SrmmWindowData *dat, struct GlobalMessageDat bufferAlloced = 1024; buffer = (char*) mir_alloc(bufferAlloced); buffer[0] = '\0'; - if (dat->flags & SMF_RTL) - AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced,"{\\rtf1\\ansi\\deff0{\\fonttbl"); - else - AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl"); + AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced,"{\\rtf1\\ansi\\deff0{\\fonttbl"); for (i = 0; i < fontOptionsListSize; i++) { LoadMsgDlgFont(i, &lf, NULL, FALSE); AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u %S;}", i, diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index 96612fa2be..a1546a6b0d 100644 --- a/plugins/Scriver/src/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp @@ -35,8 +35,8 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar ewd = (ErrorWindowData *) lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) ewd); TranslateDialogDefault(hwndDlg); - ShowWindow(GetParent(ewd->hwndParent), SW_RESTORE); if (ewd != NULL) { + ShowWindow(GetParent(ewd->hwndParent), SW_RESTORE); if (ewd->szDescription) { SetDlgItemText(hwndDlg, IDC_ERRORTEXT, ewd->szDescription); } else { -- cgit v1.2.3