pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(controller): Invalid move constructions

Browse Source 
Refs #268, #265
This commit is contained in:
Michael Carlberg 2016-12-23 13:03:03 +01:00
parent 7ecd132610
commit 1cb8e455fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/controller.cpp
View File

@ -201,7 +201,7 @@ bool controller::run(bool writeback) {
* Enqueue event * Enqueue event
*/ */
bool controller::enqueue(event&& evt) { bool controller::enqueue(event&& evt) {
if (!m_queue.enqueue(move(evt))) { if (!m_queue.enqueue(forward<decltype(evt)>(evt))) {
m_log.warn("Failed to enqueue event"); m_log.warn("Failed to enqueue event");
return false; return false;
} }
@ -220,7 +220,7 @@ bool controller::enqueue(string&& input_data) {
} else if (chrono::system_clock::now() - m_swallow_input < m_lastinput) { } else if (chrono::system_clock::now() - m_swallow_input < m_lastinput) {
m_log.trace("controller: Swallowing input event (throttled)"); m_log.trace("controller: Swallowing input event (throttled)");
} else { } else {
m_inputdata = move(input_data); m_inputdata = input_data;
return enqueue(make_input_evt()); return enqueue(make_input_evt());
} }
return false; return false;
@ -363,7 +363,7 @@ void controller::process_eventqueue() {
*/ */
void controller::process_inputdata() { void controller::process_inputdata() {
if (!m_inputdata.empty()) { if (!m_inputdata.empty()) {
auto evt = sig_ev::process_input{move(m_inputdata)}; auto evt = sig_ev::process_input{string{m_inputdata}};
m_lastinput = chrono::time_point_cast<decltype(m_swallow_input)>(chrono::system_clock::now()); m_lastinput = chrono::time_point_cast<decltype(m_swallow_input)>(chrono::system_clock::now());
m_inputdata.clear(); m_inputdata.clear();