Merge branch 'master' of gitlab.fmsoft.cn:VincentWei/minigui

This commit is contained in:
Vincent Wei
2019-07-11 19:35:44 +08:00
2 changed files with 5 additions and 4 deletions

View File

@@ -288,12 +288,12 @@ PLOGFONT GUIAPI CreateLogFontIndirect (LOGFONT *reflf)
// create new devfont instance if need
for (i = 0; i < MAXNR_DEVFONTS; i++) {
DEVFONT* df = reflf->devfonts[i];
if (df->font_ops->new_instance)
newlf->devfonts[i] = df->font_ops->new_instance(newlf,
df, i == 0);
if (df == NULL) {
goto error;
}
if (df->font_ops->new_instance)
newlf->devfonts[i] = df->font_ops->new_instance(newlf,
df, i == 0);
}
adjust_newlf_info(newlf);

View File

@@ -168,7 +168,8 @@ void* DesktopMain (void* data)
{
PSYNCMSG pSyncMsg = (PSYNCMSG)(Msg.pAdd);
pSyncMsg->retval = lRet;
sem_post(pSyncMsg->sem_handle);
if(pSyncMsg->sem_handle)
sem_post(pSyncMsg->sem_handle);
}
#ifdef _MGHAVE_TRACE_MSG