summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/splash.c
diff options
context:
space:
mode:
authoronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-28 23:21:29 +0000
committeronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-28 23:21:29 +0000
commitedfc5fcb11d71e80bbaab4fc9d02fd4682456b71 (patch)
tree585f164fef361252dbeed83741da55a4ec9ec4c6 /beryl-plugins/src/splash.c
parent1f0606fb393e2cb2b7d112885d2814d2d54e84d7 (diff)
downloadmarex-dev-edfc5fcb11d71e80bbaab4fc9d02fd4682456b71.tar.gz
marex-dev-edfc5fcb11d71e80bbaab4fc9d02fd4682456b71.tar.bz2
* added final splash images for v0.1
* free mem after splash was displayed git-svn-id: file:///beryl/trunk@366 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/splash.c')
-rw-r--r--beryl-plugins/src/splash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index daabddb..f6403e8 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -50,8 +50,8 @@
#define SPLASH_DISPLAY_OPTION_DISABLE_UPDATE 7
#define SPLASH_DISPLAY_OPTION_NUM 8
-#define SPLASH_DISPLAY_OPTION_LOGO_DEFAULT IMAGEDIR "/logo_example.png"
-#define SPLASH_DISPLAY_OPTION_BACKGROUND_DEFAULT IMAGEDIR "/back_example.png"
+#define SPLASH_DISPLAY_OPTION_LOGO_DEFAULT IMAGEDIR "/splash_logo.png"
+#define SPLASH_DISPLAY_OPTION_BACKGROUND_DEFAULT IMAGEDIR "/splash_background.png"
#define SPLASH_DISPLAY_OPTION_SATURATION_DEFAULT 50.0
#define SPLASH_DISPLAY_OPTION_BRIGHTNESS_DEFAULT 50.0
#define SPLASH_DISPLAY_OPTION_FADE_TIME_DEFAULT 1.0
@@ -202,7 +202,7 @@ splashPreparePaintScreen (CompScreen * s, int ms)
{
ss->active = FALSE;
ss->doUpdate = TRUE;
- if (!ss->hasInit)
+ if (ss->hasInit)
{
ss->hasInit = FALSE;
glDeleteTextures (1, &ss->background.handle);