From ca8905eb0affe329879247b387d2af5021924098 Mon Sep 17 00:00:00 2001
From: spacy51 <spacy51@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Tue, 21 Oct 2008 19:46:44 +0000
Subject: [PATCH] Added default "screenshots" directory.

---
 src/win32/Directories.cpp | 2 +-
 src/win32/MainWnd.cpp     | 2 +-
 src/win32/MainWndFile.cpp | 2 +-
 src/win32/VBA.h           | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/win32/Directories.cpp b/src/win32/Directories.cpp
index 4df6418b..0aea6679 100644
--- a/src/win32/Directories.cpp
+++ b/src/win32/Directories.cpp
@@ -102,7 +102,7 @@ BOOL Directories::OnInitDialog()
 	if(!p.IsEmpty())
 		GetDlgItem(IDC_SAVE_PATH)->SetWindowText(p);
 
-	p = regQueryStringValue("captureDir", NULL);
+	p = regQueryStringValue("captureDir", DEFAULT_SCREENSHOTS_DIR);
 	if(!p.IsEmpty())
 		GetDlgItem(IDC_CAPTURE_PATH)->SetWindowText(p);
 
diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp
index 90892c13..cf0b5f44 100644
--- a/src/win32/MainWnd.cpp
+++ b/src/win32/MainWnd.cpp
@@ -1083,7 +1083,7 @@ void MainWnd::screenCapture(int captureNumber)
 {
   CString buffer;
 
-  CString captureDir = regQueryStringValue("captureDir", "");
+  CString captureDir = regQueryStringValue("captureDir", DEFAULT_SCREENSHOTS_DIR);
   treatRelativePath( captureDir );
 
   int index = theApp.filename.ReverseFind('\\');
diff --git a/src/win32/MainWndFile.cpp b/src/win32/MainWndFile.cpp
index d50e10ed..579e6d40 100644
--- a/src/win32/MainWndFile.cpp
+++ b/src/win32/MainWndFile.cpp
@@ -564,7 +564,7 @@ void MainWnd::OnFileScreencapture()
   else
     name = theApp.filename;
 
-  CString capdir = regQueryStringValue("captureDir", "");
+  CString capdir = regQueryStringValue("captureDir", DEFAULT_SCREENSHOTS_DIR);
   treatRelativePath( capdir );
 
   if(capdir.IsEmpty())
diff --git a/src/win32/VBA.h b/src/win32/VBA.h
index 92b42432..ee9056d6 100644
--- a/src/win32/VBA.h
+++ b/src/win32/VBA.h
@@ -66,6 +66,7 @@ enum pixelFilterType
 
 #define DEFAULT_BATTERY_DIR    ".\\battery"
 #define DEFAULT_SAVESTATES_DIR ".\\savestates"
+#define DEFAULT_SCREENSHOTS_DIR ".\\screenshots"
 
 class AVIWrite;
 class WavWriter;