Added
Link Here
|
1 |
--- ./lib/server/CServer.cpp.orig 2006-04-02 03:47:04.000000000 +0200 |
2 |
+++ ./lib/server/CServer.cpp 2007-07-24 16:59:59.000000000 +0200 |
3 |
@@ -434,16 +434,23 @@ |
4 |
SInt32 x, SInt32 y, bool forScreensaver) |
5 |
{ |
6 |
assert(dst != NULL); |
7 |
+ assert(m_active != NULL); |
8 |
+ |
9 |
+ LOG((CLOG_INFO "switch from \"%s\" to \"%s\" at %d,%d", getName(m_active).c_str(), getName(dst).c_str(), x, y)); |
10 |
+ |
11 |
#ifndef NDEBUG |
12 |
{ |
13 |
SInt32 dx, dy, dw, dh; |
14 |
dst->getShape(dx, dy, dw, dh); |
15 |
- assert(x >= dx && y >= dy && x < dx + dw && y < dy + dh); |
16 |
+ |
17 |
+ if(!(x >= dx && y >= dy && x < dx + dw && y < dy + dh)) { |
18 |
+ LOG((CLOG_ERR "debug check failed")); |
19 |
+ LOG((CLOG_ERR "x=%d dx=%d dw=%d", x, dx, dw)); |
20 |
+ LOG((CLOG_ERR "y=%d dy=%d dh=%d", y, dy, dh)); |
21 |
+ assert(0); |
22 |
+ } |
23 |
} |
24 |
#endif |
25 |
- assert(m_active != NULL); |
26 |
- |
27 |
- LOG((CLOG_INFO "switch from \"%s\" to \"%s\" at %d,%d", getName(m_active).c_str(), getName(dst).c_str(), x, y)); |
28 |
|
29 |
// stop waiting to switch |
30 |
stopSwitch(); |