mirror of
https://github.com/VincentWei/MiniGUI.git
synced 2026-02-07 19:37:00 +08:00
Merge branch 'master' of gitlab.fmsoft.cn:VincentWei/minigui
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user