From ac825114c86dff8444b524c6017a9ea1f0add3b9 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Mon, 22 Dec 2008 10:47:37 +0000
Subject: [PATCH] small fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1623 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 7 ++++---
 Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp       | 3 +--
 Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp       | 4 +++-
 Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp        | 4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
index 45afb6b051..ac43b8108a 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
@@ -48,9 +48,10 @@ bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
 {
 	// clear tmp folder
 	{
-		std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp");
-		File::DeleteDirRecursively(WiiTempFolder.c_str());
-		File::CreateDir(WiiTempFolder.c_str());
+	    //		std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp");
+	    std::string WiiTempFolder = FULL_WII_USER_DIR + std::string("tmp");
+	    File::DeleteDirRecursively(WiiTempFolder.c_str());
+	    File::CreateDir(WiiTempFolder.c_str());
 	}
 
 	// create home directory
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp
index f83b9412ce..d289165117 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp
@@ -107,8 +107,7 @@ SDLWindow::SDLWindow(int _iwidth, int _iheight) {
 
     //init sdl video
     if (SDL_Init(SDL_INIT_VIDEO) < 0) {
-	PanicAlert("Failed to init SDL");
-	//TODO : Display an error message
+	PanicAlert("Failed to init SDL: %s", SDL_GetError());
 	SDL_Quit();
 	//	return NULL;
     }
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
index 011218e2f3..3125711f80 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
@@ -57,7 +57,9 @@ X11Window::X11Window(int _iwidth, int _iheight) {
                           GLX_GREEN_SIZE, 8, 
                           GLX_BLUE_SIZE, 8, 
                           GLX_DEPTH_SIZE, 24,
-                          GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None };
+                          GLX_SAMPLE_BUFFERS_ARB, 
+			  g_Config.iMultisampleMode, 
+			  GLX_SAMPLES_ARB, 1, None };
     dpy = XOpenDisplay(0);
     g_VideoInitialize.pWindowHandle = (HWND)dpy;
     screen = DefaultScreen(dpy);
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
index 516f2ba3c3..e53cca1013 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
@@ -42,6 +42,10 @@ CONTROLLER_STATE joystate[4];
 CONTROLLER_MAPPING joysticks[4];
 bool emulator_running = FALSE;
 
+// TODO: fix this dirty hack to stop missing symbols
+void __Log(int log, const char *format, ...) {}
+void __Logv(int log, int v, const char *format, ...) {}
+
 // Handle to window
 HWND m_hWnd;