Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 12:28:31 +01:00
Code Issues Releases Wiki Activity

Fix some weird crashes on windows

Browse Source
This commit is contained in:
David Sansome 2010-06-07 14:51:47 +00:00
parent 729e6783a9
commit afca8d2900
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libprojectm/PresetLoader.cpp vendored
View File

@ -84,6 +84,8 @@ void PresetLoader::rescan()
while ( ( dir_entry = readdir ( _dir ) ) != NULL )
{
if (dir_entry->d_name == 0)
continue;
std::ostringstream out;
// Convert char * to friendly string

2
3rdparty/libprojectm/Renderer/TextureManager.cpp vendored
View File

@ -219,7 +219,7 @@ void TextureManager::loadTextureDir()
// Allocate a new a stream given the current directory name
if ((m_dir = opendir(dirname.c_str())) == NULL)
{
std::cout<<"No Textures Loaded from "<<dirname<<std::endl;
//std::cout<<"No Textures Loaded from "<<dirname<<std::endl;
return; // no files loaded. m_entries is empty
}

26
3rdparty/libprojectm/patches/05-fix-windows-crashes.patch vendored Normal file
View File

@ -0,0 +1,26 @@
Index: Renderer/TextureManager.cpp
===================================================================
--- Renderer/TextureManager.cpp (revision 1065)
+++ Renderer/TextureManager.cpp (working copy)
@@ -219,7 +219,7 @@
// Allocate a new a stream given the current directory name
if ((m_dir = opendir(dirname.c_str())) == NULL)
{
- std::cout<<"No Textures Loaded from "<<dirname<<std::endl;
+ //std::cout<<"No Textures Loaded from "<<dirname<<std::endl;
return; // no files loaded. m_entries is empty
}
Index: PresetLoader.cpp
===================================================================
--- PresetLoader.cpp (revision 1065)
+++ PresetLoader.cpp (working copy)
@@ -84,6 +84,8 @@
while ( ( dir_entry = readdir ( _dir ) ) != NULL )
{
+ if (dir_entry->d_name == 0)
+ continue;
std::ostringstream out;
// Convert char * to friendly string