Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/util/wf-ipc.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <fcntl.h>
#include <functional>
#include <giomm/enums.h>
Expand Down Expand Up @@ -82,7 +81,7 @@ void WayfireIPC::send(const std::string& message, int response_handler)

void WayfireIPC::send_message(const std::string& message)
{
if (output->has_pending())
if (output->has_pending() || writing)
{
write_queue.push(message);
write_next();
Expand Down Expand Up @@ -135,6 +134,7 @@ void WayfireIPC::write_stream(const std::string& message)
}
} catch (const Glib::Error& e)
{
this->writing = false;
if (e.code() == G_IO_ERROR_CANCELLED)
{
// Intended behavior
Expand Down
1 change: 0 additions & 1 deletion src/util/wf-ipc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class IPCClient
IPCClient(int id, std::shared_ptr<WayfireIPC> ipc) : id(id), ipc(ipc)
{}
~IPCClient();
int get_id();
void handle_response(wf::json_t response);
void send(const std::string& message);
void send(const std::string& message, response_handler cb);
Expand Down
Loading