git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spinner handling
[enigma2.git]
/
lib
/
gdi
/
grc.cpp
diff --git
a/lib/gdi/grc.cpp
b/lib/gdi/grc.cpp
index a46b218c3d74a4169b38a70c1c6bf6712fb6d7fc..c8af2457e1d67a7911ff1cb6430de257e4b0dbae 100644
(file)
--- a/
lib/gdi/grc.cpp
+++ b/
lib/gdi/grc.cpp
@@
-119,7
+119,7
@@
void *gRC::thread()
break;
else if (o.opcode==gOpcode::notify)
need_notify = 1;
break;
else if (o.opcode==gOpcode::notify)
need_notify = 1;
- else
+ else
if(o.dc)
{
o.dc->exec(&o);
// o.dc is a gDC* filled with grabref... so we must release it here
{
o.dc->exec(&o);
// o.dc is a gDC* filled with grabref... so we must release it here
@@
-139,24
+139,21
@@
void *gRC::thread()
/* when the main thread is non-idle for a too long time without any display output,
we want to display a spinner. */
/* when the main thread is non-idle for a too long time without any display output,
we want to display a spinner. */
-
- struct timeval time;
struct timespec timeout;
struct timespec timeout;
- gettimeofday(&time, NULL);
- timeout.tv_sec = time.tv_sec;
- timeout.tv_nsec = time.tv_usec * 1000;
-
+ clock_gettime(CLOCK_REALTIME, &timeout);
+
if (m_spinner_enabled)
if (m_spinner_enabled)
+ {
timeout.tv_nsec += 100*1000*1000;
timeout.tv_nsec += 100*1000*1000;
- else
- timeout.tv_sec += 2;
-
/* yes, this is required. */
/* yes, this is required. */
- if (timeout.tv_nsec > 1000*1000*1000)
- {
- timeout.tv_nsec -= 1000*1000*1000;
- timeout.tv_sec++;
+ if (timeout.tv_nsec > 1000*1000*1000)
+ {
+ timeout.tv_nsec -= 1000*1000*1000;
+ timeout.tv_sec++;
+ }
}
}
+ else
+ timeout.tv_sec += 2;
int idle = 1;
int idle = 1;
@@
-165,8
+162,6
@@
void *gRC::thread()
if (eApp && !eApp->isIdle())
idle = 0;
}
if (eApp && !eApp->isIdle())
idle = 0;
}
-
- pthread_mutex_unlock(&mutex);
if (!idle)
{
if (!idle)
{
@@
-176,6
+171,7
@@
void *gRC::thread()
} else
disableSpinner();
}
} else
disableSpinner();
}
+ pthread_mutex_unlock(&mutex);
#endif
}
}
#endif
}
}