git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes bug #582
[enigma2.git]
/
lib
/
components
/
file_eraser.cpp
diff --git
a/lib/components/file_eraser.cpp
b/lib/components/file_eraser.cpp
index ea68eb44329bc893a8b3dbdd816ef18d1217b268..9f92fa443012c5dee57090f82c5433ca5e9e29d8 100644
(file)
--- a/
lib/components/file_eraser.cpp
+++ b/
lib/components/file_eraser.cpp
@@
-11,12
+11,12
@@
eBackgroundFileEraser *eBackgroundFileEraser::instance;
eBackgroundFileEraser::eBackgroundFileEraser()
eBackgroundFileEraser *eBackgroundFileEraser::instance;
eBackgroundFileEraser::eBackgroundFileEraser()
- :messages(this,1), stop_thread_timer(
this
)
+ :messages(this,1), stop_thread_timer(
eTimer::create(this)
)
{
if (!instance)
instance=this;
CONNECT(messages.recv_msg, eBackgroundFileEraser::gotMessage);
{
if (!instance)
instance=this;
CONNECT(messages.recv_msg, eBackgroundFileEraser::gotMessage);
- CONNECT(stop_thread_timer
.
timeout, eBackgroundFileEraser::idle);
+ CONNECT(stop_thread_timer
->
timeout, eBackgroundFileEraser::idle);
}
void eBackgroundFileEraser::idle()
}
void eBackgroundFileEraser::idle()
@@
-29,6
+29,7
@@
eBackgroundFileEraser::~eBackgroundFileEraser()
messages.send(Message::quit);
if (instance==this)
instance=0;
messages.send(Message::quit);
if (instance==this)
instance=0;
+ kill(); // i dont understand why this is needed .. in ~eThread::eThread is a kill() to..
}
void eBackgroundFileEraser::thread()
}
void eBackgroundFileEraser::thread()
@@
-43,7
+44,7
@@
void eBackgroundFileEraser::thread()
runLoop();
runLoop();
- stop_thread_timer
.
stop();
+ stop_thread_timer
->
stop();
}
void eBackgroundFileEraser::erase(const char *filename)
}
void eBackgroundFileEraser::erase(const char *filename)
@@
-51,7
+52,7
@@
void eBackgroundFileEraser::erase(const char *filename)
if (filename)
{
char buf[255];
if (filename)
{
char buf[255];
- snprintf(buf, 255, "%s.
$$$
", filename);
+ snprintf(buf, 255, "%s.
del
", filename);
if (rename(filename, buf)<0)
;/*perror("rename file failed !!!");*/
else
if (rename(filename, buf)<0)
;/*perror("rename file failed !!!");*/
else
@@
-75,7
+76,7
@@
void eBackgroundFileEraser::gotMessage(const Message &msg )
eDebug("file %s erased", msg.filename);
free((char*)msg.filename);
}
eDebug("file %s erased", msg.filename);
free((char*)msg.filename);
}
- stop_thread_timer
.
start(1000, true); // stop thread in one seconds
+ stop_thread_timer
->
start(1000, true); // stop thread in one seconds
break;
case Message::quit:
quit(0);
break;
case Message::quit:
quit(0);