1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 777b32d..8111aaf 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -124,7 +124,9 @@ bool LLWindowSDL::ll_try_gtk_init(void)
         if (!tried_gtk_init)
         {
                 tried_gtk_init = TRUE;
+///#if LL_GSTREAMER_ENABLED
                 if (!g_thread_supported ()) g_thread_init (NULL);
+///#endif // LL_GSTREAMER_ENABLED
                 maybe_lock_display();
                 gtk_is_good = gtk_init_check(NULL, NULL);
                 maybe_unlock_display();
@@ -448,7 +450,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 
         // Set the application icon.
         SDL_Surface *bmpsurface;
-        bmpsurface = Load_BMP_Resource("ll_icon.BMP");
+        bmpsurface = Load_BMP_Resource("imprudence_icon.BMP");
         if (bmpsurface)
         {
                 // This attempts to give a black-keyed mask to the icon.