Skip to content

Commit 231b5c3

Browse files
committed
Merge branch 'develop' into bugfix/45/whole_screen_region_screenshots
2 parents 78fdfad + 8485345 commit 231b5c3

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

Diff for: .build/pre-release.sh

100644100755
File mode changed.

Diff for: .github/workflows/snapshot_release.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,15 @@ jobs:
7070
shell: powershell
7171
env:
7272
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
73+
74+
dispatch:
75+
needs:
76+
- deploy
77+
runs-on: ubuntu-latest
78+
steps:
79+
- name: Dispatch snapshot release
80+
uses: peter-evans/repository-dispatch@v1
81+
with:
82+
token: ${{ secrets.SNAPSHOT_DISPATCH_TOKEN }}
83+
repository: nut-tree/libnut-install
84+
event-type: snapshot-release

Diff for: src/linux/xdisplay.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
static Display *mainDisplay = NULL;
77
static int registered = 0;
8-
static char *displayName = ":0.0";
8+
static char *displayName = NULL;
99
static int hasDisplayNameChanged = 0;
1010

1111
Display *XGetMainDisplay(void)
@@ -20,11 +20,6 @@ Display *XGetMainDisplay(void)
2020
/* First try the user set displayName */
2121
mainDisplay = XOpenDisplay(displayName);
2222

23-
/* Then try using environment variable DISPLAY */
24-
if (mainDisplay == NULL) {
25-
mainDisplay = XOpenDisplay(NULL);
26-
}
27-
2823
if (mainDisplay == NULL) {
2924
fputs("Could not open main display\n", stderr);
3025
} else if (!registered) {

Diff for: test/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: test/window-integration-tests/package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: test/window-integration-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"electron": "9.1.2",
16+
"electron": "9.4.0",
1717
"jest": "26.2.2",
1818
"spectron": "11.1.0"
1919
}

0 commit comments

Comments
 (0)