[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3751 - trunk/pingus/src/screen
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3751 - trunk/pingus/src/screen |
Date: |
Wed, 9 Jul 2008 04:08:29 +0200 |
Author: grumbel
Date: 2008-07-09 04:08:28 +0200 (Wed, 09 Jul 2008)
New Revision: 3751
Modified:
trunk/pingus/src/screen/screen_manager.cpp
Log:
Fixed issue with pop_all()
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2008-07-09 02:07:57 UTC (rev
3750)
+++ trunk/pingus/src/screen/screen_manager.cpp 2008-07-09 02:08:28 UTC (rev
3751)
@@ -141,8 +141,10 @@
ScreenPtr
ScreenManager::get_current_screen()
{
- assert(!screens.empty());
- return screens.back();
+ if (screens.empty())
+ return ScreenPtr();
+ else
+ return screens.back();
}
ScreenManager*
@@ -201,6 +203,9 @@
void
ScreenManager::fade_over(ScreenPtr old_screen, ScreenPtr new_screen)
{
+ if (!old_screen.get() || !new_screen.get())
+ return;
+
Uint32 last_ticks = SDL_GetTicks();
float progress = 0.0f;
while (progress <= 1.0f)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3751 - trunk/pingus/src/screen,
grumbel at BerliOS <=