diff --git a/doc/Changelog.html b/doc/Changelog.html index 08f35f39..c06b646a 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -20,7 +20,7 @@ a:visited { color: #0000EE; }
  • Upgraded build environment to Microsoft Visual Studio 2010
  • Dropping support for Windows 2000 and for Windows XP RTM/SP1, Windows XP needs SP2 or SP3 now!
  • Added a new translation: Korean -
  • Updated LAME encoder to v3.99.1.0 (2011-04-15), compiled with ICL 12.0.3 and MSVC 10.0 +
  • Updated LAME encoder to v3.99.1.0 (2011-04-15), compiled with ICL 12.0.3 and MSVC 10.0 (details)
  • Updated MediaInfo to v0.7.43 (2011-04-10), compiled with ICL 12.0.3 and MSVC 10.0
  • Updated language files (big thank-you to all contributors !!!)
    diff --git a/src/Config.h b/src/Config.h index 27cb781b..0c6ed5f9 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 444 +#define VER_LAMEXP_BUILD 445 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Global.cpp b/src/Global.cpp index 0827d433..cf13b24e 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -689,6 +689,11 @@ bool lamexp_init_qt(int argc, char* argv[]) break; } + //Check for Wine + QLibrary ntdll("ntdll.dll"); + bool isWine = (ntdll.resolve("wine_get_version") != NULL) || (ntdll.resolve("wine_nt_to_unix_file_name") != NULL); + if(isWine) qWarning("It appears we are running under Wine, unexpected things might happen!\n"); + //Create Qt application instance and setup version info QDate date = QDate::currentDate(); QApplication *application = new QApplication(argc, argv); @@ -731,7 +736,7 @@ bool lamexp_init_qt(int argc, char* argv[]) } //Update console icon, if a console is attached - if(g_lamexp_console_attached) + if(g_lamexp_console_attached && !isWine) { typedef DWORD (__stdcall *SetConsoleIconFun)(HICON); QLibrary kernel32("kernel32.dll");