mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-14 08:22:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15

Browse source
This commit is contained in:
Drew DeVault 2017-12-17 15:51:49 -05:00
commit 1c4a086e75
9 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
swaylock/main.c
View file

@ -3,7 +3,6 @@
#include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-names.h>
#include <security/pam_appl.h>
#include <json-c/json.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -14,6 +13,7 @@
#include <signal.h>
#include <stdbool.h>
#include <unistd.h>
#include "sway_json_helper.h"
#include "client/window.h"
#include "client/registry.h"
#include "client/cairo.h"
@ -583,7 +583,7 @@ int main(int argc, char **argv) {
for (i = 0; i < registry->outputs->length; ++i) {
if (displays_paths[i * 2] != NULL) {
for (int j = 0;; ++j) {
for (json_ar_len_t j = 0;; ++j) {
if (j >= json_object_array_length(json_outputs)) {
sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]);
exit(EXIT_FAILURE);