X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=545071cd9ae638fe4b5e0b52e63abe1b5273b37e;hb=cf736a0286ed40b6e671e77fd080812edd75f80b;hp=269837bdb22fc0c7dbc1eaa8433d39ad7a940448;hpb=50ffaff1de1b05f1bf76dd842e734eff2974afd4;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 269837b..545071c 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -477,7 +477,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 				"Image files\0*.bmp\0\0";
 		          OPENFILENAME ofn;
 
-		          safeStrCpy( buf, "" , sizeof( buf)/sizeof( buf[0]) );
+			  GetDlgItemText( hDlg, i+3, buf, MSG_SIZ );
 
 		          ZeroMemory( &ofn, sizeof(ofn) );
 
@@ -499,6 +499,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		          }
 		} else
 		if(j == -3) {
+		    GetDlgItemText( hDlg, i+3, buf, MSG_SIZ );
 		    if( BrowseForFolder( _("Choose Folder:"), buf ) ) {
 			SetDlgItemText( hDlg, i+3, buf );
 		    }
@@ -781,7 +782,7 @@ Option themeOptions[] = {
   {   0,  0,    0, NULL, (void*) &appData.useBorder, NULL, NULL, CheckBox, N_("Draw border around board") },
   {   0,  0, 32+0, NULL, (void*) &appData.border, NULL, NULL, FileName, N_("Optional border bitmap:") },
   {   0,  0,    0, NULL, NULL, NULL, NULL, Label, N_("        Beware: a specified piece font will prevail over piece bitmaps") },
-  {   0,  0,    0, NULL, (void*) &appData.bitmapDirectory, NULL, NULL, PathName, N_("Directory with piece bitmaps:") },
+  {   0,  0,    0, NULL, (void*) &appData.pieceDirectory, NULL, NULL, PathName, N_("Directory with piece bitmaps:") },
   {   0,  0,    0, NULL, (void*) &appData.useFont, NULL, NULL, CheckBox, N_("Use piece font") },
   {   0, 50,  150, NULL, (void*) &appData.fontPieceSize, "", NULL, Spin, N_("Font size (%):") },
   {   0,  0,    0, NULL, (void*) &appData.renderPiecesWithFont, NULL, NULL, TextBox, N_("Font name:") },
@@ -976,7 +977,7 @@ void TourneyPopup(HWND hwnd)
 {
     int n = NamesToList(firstChessProgramNames, engineList, engineMnemonic, "");
     autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;
-    twice = FALSE; swiss = appData.tourneyType < 0;
+    twice = appData.loadGameIndex == -2 || appData.loadPositionIndex == -2; swiss = appData.tourneyType < 0;
     tourneyOptions[0].max = n;
     snprintf(title, MSG_SIZ, _("Tournament and Match Options"));
     ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));