Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use AppImage path for hash when running as AppImage. #139

Merged
merged 8 commits into from
Sep 20, 2021
Merged

Use AppImage path for hash when running as AppImage. #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f030b37
Use AppImage path for hash when running as AppImage.
mklein-de Sep 20, 2021
7d366c7
Use QByteArray instead of QString
mklein-de Sep 20, 2021
a30128b
Compile fix
mklein-de Sep 20, 2021
6aa2d34
Style and explanation improvements
itay-grudev Sep 20, 2021
a8aa298
v3.3.1
itay-grudev Sep 20, 2021
cc96fea
Update singleapplication_p.cpp
itay-grudev Sep 20, 2021
bca0b77
Update singleapplication_p.cpp
itay-grudev Sep 20, 2021
9856ade
Update singleapplication_p.cpp
itay-grudev Sep 20, 2021
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Changelog
If by accident I have forgotten to credit someone in the CHANGELOG, email me and I will fix it.


__3.3.1__
---------

* Added support for _AppImage_ dynamic executable paths. - _Michael Klein_

__3.3.0__
---------

Expand Down
11 changes: 10 additions & 1 deletion singleapplication_p.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,17 @@ void SingleApplicationPrivate::genBlockServerName()
}

if( ! (options & SingleApplication::Mode::ExcludeAppPath) ){
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN)
appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
#elif defined(Q_OS_LINUX)
// If the application is running as an AppImage then the APPIMAGE env var should be used
// instead of applicationPath() as each instance is launched with its own executable path
const QByteArray appImagePath = qgetenv( "APPIMAGE" );
if( appImagePath.isEmpty() ){ // Not running as AppImage: use path to executable file
appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
} else { // Running as AppImage: Use absolute path to AppImage file
appData.addData( appImagePath );
};
#else
appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
#endif
Expand Down