# HG changeset patch
# User nemo
# Date 1381689614 14400
# Node ID db77654c35655a02fba947a143675a3fb126a2ef
# Parent  0dc3b8f94b0bc12811a4862dd65a07f5f5695828# Parent  7fcdedc455897f8ab10331062f26a2945c670781
merge last rev

diff -r 7fcdedc45589 -r db77654c3565 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sun Oct 13 22:31:51 2013 +0400
+++ b/hedgewars/uStore.pas	Sun Oct 13 14:40:14 2013 -0400
@@ -704,20 +704,20 @@
 end;
 
 procedure SetupOpenGL;
-var name: array[byte] of char;
+var buf: array[byte] of char;
     AuxBufNum: LongInt = 0;
     tmpstr: AnsiString;
     tmpint: LongInt;
     tmpn: LongInt;
 begin
 {$IFDEF SDL2}
-    name:= SDL_GetCurrentVideoDriver();
+    AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_GetCurrentVideoDriver()) + ')');
 {$ELSE}
-    name:= SDL_VideoDriverName(name, sizeof(name));
+    buf[0]:= char(0); // avoid compiler hint
+    AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_VideoDriverName(buf, sizeof(buf))) + ')');
 {$ENDIF}
 
     AuxBufNum:= AuxBufNum;
-    AddFileLog('Setting up OpenGL (using driver: ' + shortstring(name) + ')');
 
 {$IFDEF MOBILE}
     // TODO: this function creates an opengles1.1 context