From ba3cab450b1313036379aa4b2f88783c087858f1 Mon Sep 17 00:00:00 2001 From: Rob Haarsma Date: Sun, 11 May 2003 16:48:55 +0000 Subject: [PATCH] (win32) you can now safely cancel the avicodec dialog --- source/blender/src/buttons.c | 4 ++-- source/blender/src/ghostwinlay.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/blender/src/buttons.c b/source/blender/src/buttons.c index c491ecf61b2..9a8ec4278e5 100644 --- a/source/blender/src/buttons.c +++ b/source/blender/src/buttons.c @@ -6578,7 +6578,7 @@ void renderbuts(void) #ifdef WITH_QUICKTIME #if defined (_WIN32) || defined (__APPLE__) if(!have_qtcodec) - uiDefBut(block, LABEL, 0, "Codec: undefined", 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, LABEL, 0, "Codec: not set", 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); else uiDefBut(block, LABEL, 0, qtcdname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime"); @@ -6600,7 +6600,7 @@ void renderbuts(void) #endif /* WITH_QUICKTIME */ } else { #ifdef _WIN32 - if(G.scene->r.avicodecdata->avicodecname[0] == NULL) + if(G.scene->r.avicodecdata == NULL) uiDefBut(block, LABEL, 0, "Codec: not set.", 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); else uiDefBut(block, LABEL, 0, G.scene->r.avicodecdata->avicodecname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index 0345f77cf28..8298d6b58b0 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -574,6 +574,10 @@ void window_raise(Window *win) { #ifdef _WIN32 //FULLSCREEN void window_toggle_fullscreen(Window *win, int fullscreen) { + /* these two lines make sure front and backbuffer are equal. for swapbuffers */ + markdirty_all(); + screen_swapbuffers(); + if(fullscreen) GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateFullScreen); else