From 39aed329f9afeba42d6643057286845591771ff2 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Sun, 14 Sep 2008 22:25:28 +0000 Subject: [PATCH] Fixes Sorting in Linux, already tested in Windows. and if logging isn't enabled when loading a dynamic library in Linux, it will print instead of log git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@527 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/DynamicLibrary.cpp | 6 +++++- Source/Core/DolphinWX/Src/Frame.cpp | 2 +- Source/Core/DolphinWX/Src/ISOFile.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp index c0133576c7..07b30cdba7 100644 --- a/Source/Core/Common/Src/DynamicLibrary.cpp +++ b/Source/Core/Common/Src/DynamicLibrary.cpp @@ -81,7 +81,11 @@ bool DynamicLibrary::Load(const char* filename) library = dlopen(filename, RTLD_NOW | RTLD_LOCAL); if (!library) { - LOG(MASTER_LOG, "Error loading DLL %s: %s", filename, dlerror()); + #ifdef LOGGING + LOG(MASTER_LOG, "Error loading DLL %s: %s", filename, dlerror()); + #else + printf("Error loading DLL %s: %s", filename, dlerror()); + #endif return false; } #endif diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 25d604ae49..8032d81207 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -154,7 +154,7 @@ CFrame::CFrame(wxFrame* parent, m_GameListCtrl = new CGameListCtrl(m_Panel, LIST_CTRL, wxDefaultPosition, wxDefaultSize, - wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING); + wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL); wxBoxSizer* sizerPanel = new wxBoxSizer(wxHORIZONTAL); sizerPanel->Add(m_GameListCtrl, 2, wxEXPAND | wxALL); diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index 11e8aa25ae..44d430e2fe 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -47,7 +47,7 @@ class CISOFile bool operator < (const CISOFile &other) const { // HACK - they end up in reverse order in the list view - return strcmp(m_Name.c_str(), other.m_Name.c_str()) > 0; + return strcasecmp(m_Name.c_str(), other.m_Name.c_str()) < 0; } private: