revert r612, fix VID_Test blackscreen properly

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@826 af15c1b1-3010-417e-b628-4374ebc0bcbd

quakespasm/Quake/gl_draw.c

@@ -652,7 +652,7 @@ void Draw_ConsoleBackground (void)
 
 	alpha = (con_forcedup) ? 1.0 : scr_conalpha.value;
 
-//	GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
+	GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
 
 	if (alpha > 0.0)
 	{

quakespasm/Quake/gl_screen.c

@@ -1035,7 +1035,10 @@ void SCR_UpdateScreen (void)
 
 	if (scr_drawdialog) //new game confirm
 	{
-		Sbar_Draw ();
+		if (con_forcedup)
+			Draw_ConsoleBackground ();
+		else
+			Sbar_Draw ();
 		Draw_FadeScreen ();
 		SCR_DrawNotifyString ();
 	}

quakespasm/Quake/gl_vidsdl.c

@@ -379,7 +379,6 @@ static void VID_Test (void)
 	old_fullscreen = draw_context->flags & SDL_FULLSCREEN ? true : false;
 
 	VID_Restart ();
-	SCR_UpdateScreen ();
 
 	//pop up confirmation dialoge
 	if (!SCR_ModalMessage("Would you like to keep this\nvideo mode? (y/n)\n", 5.0f))