- fixes & cleanups from pvqa-player windows build
This commit is contained in:
parent
aa882bc1a8
commit
63e5034c17
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#if defined(TARGET_WIN)
|
#if defined(TARGET_WIN)
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
#include <iostream>
|
||||||
#include "helper/HL_String.h"
|
#include "helper/HL_String.h"
|
||||||
|
|
||||||
std::string OsProcess::execCommand(const std::string& cmd)
|
std::string OsProcess::execCommand(const std::string& cmd)
|
||||||
|
|
@ -84,6 +85,8 @@ std::shared_ptr<std::thread> OsProcess::asyncExecCommand(const std::string& cmdl
|
||||||
std::function<void(const std::string& reason)> finished_callback,
|
std::function<void(const std::string& reason)> finished_callback,
|
||||||
bool& finish_flag)
|
bool& finish_flag)
|
||||||
{
|
{
|
||||||
|
// std::cout << cmdline << std::endl;
|
||||||
|
|
||||||
std::string output;
|
std::string output;
|
||||||
HANDLE hPipeRead, hPipeWrite;
|
HANDLE hPipeRead, hPipeWrite;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -236,7 +236,7 @@ size_t TimerQueue::cancel(uint64_t id) {
|
||||||
newItem.handler = std::move(item.handler);
|
newItem.handler = std::move(item.handler);
|
||||||
item.handler = nullptr;
|
item.handler = nullptr;
|
||||||
m_items.push(std::move(newItem));
|
m_items.push(std::move(newItem));
|
||||||
std::cout << "Cancelled timer. " << std::endl;
|
// std::cout << "Cancelled timer. " << std::endl;
|
||||||
lk.unlock();
|
lk.unlock();
|
||||||
// Something changed, so wake up timer thread
|
// Something changed, so wake up timer thread
|
||||||
m_checkWork.notify();
|
m_checkWork.notify();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue