diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-21 11:42:44 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-21 11:42:44 -0300 |
| commit | f7f197c40941ffaf03fcddeb20536dec8074ca00 (patch) | |
| tree | 7a69483162bb873813f6152176b815d189af4edd /platform/x11/os_x11.cpp | |
| parent | 9783f6fc969947fdbf666950ab3da21ac462c57e (diff) | |
-ability to set default textures in shader (needed for visual shader editing)
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 804809a87d..aa9e4c63c9 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1458,14 +1458,14 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_rtaudio); #endif -#ifdef ALSA_ENABLED - AudioDriverManagerSW::add_driver(&driver_alsa); -#endif - #ifdef PULSEAUDIO_ENABLED AudioDriverManagerSW::add_driver(&driver_pulseaudio); #endif +#ifdef ALSA_ENABLED + AudioDriverManagerSW::add_driver(&driver_alsa); +#endif + minimized = false; xim_style=NULL; mouse_mode=MOUSE_MODE_VISIBLE; |