Merge pull request #1 from mox-mox/dev

Fix build, add missing brace in readme
This commit is contained in:
Sergey Naumov
2016-04-20 06:36:56 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -23,7 +23,7 @@ Then just type this in your `CMakeLists.txt`:
add_subdirectory(i3ipc++)
include_directories(${I3IPCpp_INCLUDE_DIRS})
link_directories(${I3IPCpp_LIBRARY_DIRS)
link_directories(${I3IPCpp_LIBRARY_DIRS})
...
```

View File

@@ -242,8 +242,8 @@ std::vector<output_t> I3Connection::get_outputs() const {
outputs.push_back({
.name = name.asString(),
.active = active.asBool(),
.rect = parse_rect_from_json(rect),
.current_workspace = (current_workspace.isNull() ? std::string() : current_workspace.asString()),
.rect = parse_rect_from_json(rect),
});
}