Merge from 3.1.x: PR #4133

Fixes #4127
spyder-ide · Feb 16, 2017 · 9c00dd6 · 9c00dd6
2 parents b4229cf + a88f67e
commit 9c00dd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py
@@ -120,7 +120,7 @@
 # Create splash screen out of MainWindow to reduce perceived startup time. 
 #==============================================================================
 from spyder.config.base import _, get_image_path, DEV, PYTEST
-SPLASH = QSplashScreen(QPixmap(get_image_path('splash.svg'), 'svg'))
+SPLASH = QSplashScreen(QPixmap(get_image_path('splash.svg')))
 SPLASH_FONT = SPLASH.font()
 SPLASH_FONT.setPixelSize(10)
 SPLASH.setFont(SPLASH_FONT)

diff --git a/spyder/config/base.py b/spyder/config/base.py
@@ -214,6 +214,7 @@ def get_image_path(name, default="not_found.png"):
         if osp.isfile(full_path):
             return osp.abspath(full_path)
     if default is not None:
+        img_path = osp.join(get_module_path('spyder'), 'images')
         return osp.abspath(osp.join(img_path, default))