Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
2aa67b86
Commit
2aa67b86
authored
Aug 02, 2017
by
Pieterjan Vanhoof
Committed by
GitHub
Aug 02, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #185 from DanGould/master
escape slash in logo.ico windows path
parents
ff41a609
4f86caf6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
main.ts
Breeze.UI/main.ts
+2
-2
No files found.
Breeze.UI/main.ts
View file @
2aa67b86
const
electron
=
require
(
'electron'
);
const
electron
=
require
(
'electron'
);
// Module to control application life.
// Module to control application life.
const
app
=
electron
.
app
;
const
app
=
electron
.
app
;
...
@@ -146,7 +146,7 @@ function createTray() {
...
@@ -146,7 +146,7 @@ function createTray() {
var
iconPath
var
iconPath
if
(
os
.
platform
()
===
'win32'
)
{
if
(
os
.
platform
()
===
'win32'
)
{
if
(
serve
)
{
if
(
serve
)
{
iconPath
=
'.
\
src
\
assets
\
images
\
breeze-logo-tray.ico'
;
iconPath
=
'.
\
\
src
\\
assets
\\
images
\
\
breeze-logo-tray.ico'
;
}
else
{
}
else
{
iconPath
=
path
.
join
(
__dirname
+
'
\\
assets
\\
images
\\
breeze-logo-tray.png'
);
iconPath
=
path
.
join
(
__dirname
+
'
\\
assets
\\
images
\\
breeze-logo-tray.png'
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment