Fix merge

friction2d · Sep 8, 2024 · 2889c95 · 2889c95
1 parent e8871a2
commit 2889c95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/app/renderhandler.cpp b/src/app/renderhandler.cpp
@@ -418,7 +418,7 @@ void RenderHandler::stopAudio() {
 }
 
 void RenderHandler::audioPushTimerExpired() {
-    if(!mCurrentSoundComposition | mNoAudio) return;
+    if(!mCurrentSoundComposition || mNoAudio) return;
     while(auto request = mAudioHandler.dataRequest()) {
         const qint64 len = mCurrentSoundComposition->read(
                     request.fData, request.fSize);

diff --git a/src/core/appsupport.h b/src/core/appsupport.h
@@ -126,6 +126,17 @@ namespace Friction
             static bool hasXDGDesktopIntegration();
             static bool setupXDGDesktopIntegration();
             static bool removeXDGDesktopIntegration();
+            static void initXDGDesktop(const bool &isRenderer);
+            static bool hasArg(int argc,
+                               char *argv[],
+                               const QString &find);
+            static void checkPerms(const bool &isRenderer);
+            static void checkFFmpeg(const bool &isRenderer);
+            static void initEnv(const bool &isRenderer);
+            static QPair<bool,int> handleXDGArgs(const bool &isRenderer,
+                                                  const QStringList &args);
+            static void printVersion();
+            static void printHelp(const bool &isRenderer);
             static const ExpressionPreset readEasingPreset(const QString &filename);
             static const QList<QPair<QString,QString>> getEasingPresets();
             static void handlePortableFirstRun();