diff --git a/.gitignore b/.gitignore
index 0e264760..c574ca5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,11 +21,13 @@
*.lib
*.exe
*.tlog
-*.vcxproj
*.filters
+*.ilk
+*.exp
+*.dll
-Bin/Content/
+Bin/Content/Sound/
Bin/Executable/
Obj/
External/
diff --git a/Code/Misc/Resource/OResourceHandler.cpp b/Code/Misc/Resource/OResourceHandler.cpp
index 36154d09..f86c434c 100644
--- a/Code/Misc/Resource/OResourceHandler.cpp
+++ b/Code/Misc/Resource/OResourceHandler.cpp
@@ -88,7 +88,10 @@ OHRESOURCE OysterResource::LoadResource(const wchar_t filename[], CustomLoadFunc
resourcePrivate.SaveResource(resourceData);
}
}
-
+ if(!resourceData)
+ {
+ return 0;
+ }
return (OHRESOURCE)resourceData->GetResourceHandle();
}
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj
index 29acd43e..ed998710 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj
@@ -30,20 +30,20 @@
MultiByte
- StaticLibrary
+ DynamicLibrary
true
v110
MultiByte
- StaticLibrary
+ DynamicLibrary
false
v110
true
MultiByte
- StaticLibrary
+ DynamicLibrary
false
v110
true