projects
/
irwi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "Removed onlinepollerthread"
[irwi]
/
src
/
onlinepollerthread.cpp
diff --git
a/src/onlinepollerthread.cpp
b/src/onlinepollerthread.cpp
index
89cc31a
..
7513b8d
100644
(file)
--- a/
src/onlinepollerthread.cpp
+++ b/
src/onlinepollerthread.cpp
@@
-18,11
+18,18
@@
void OnlinePollerThread::run()
if (!qncm.isOnline()) {
msleep(250);
} else {
+<<<<<<< HEAD
+=======
+ emit online();
+>>>>>>> 2fd880d... Removed onlinepollerthread
break;
}
}
}
+<<<<<<< HEAD
emit online();
+=======
+>>>>>>> 2fd880d... Removed onlinepollerthread
exec();
}