46 lines
1.0 KiB
Plaintext
46 lines
1.0 KiB
Plaintext
From 9df6715c21c6064153a068f11ff008d71615aefc Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 30 Mar 2021 10:59:41 +0200
|
|
Subject: include haiku.h in setup.c
|
|
|
|
improve haiku_get_app_path()
|
|
|
|
diff --git a/src/haiku.cpp b/src/haiku.cpp
|
|
index 708564c..a13e623 100644
|
|
--- a/src/haiku.cpp
|
|
+++ b/src/haiku.cpp
|
|
@@ -63,12 +63,13 @@ char* haiku_get_clipboard()
|
|
const char* haiku_get_app_path()
|
|
{
|
|
static image_info info;
|
|
- static int32 cookie = 0;
|
|
+ int32 cookie = 0;
|
|
|
|
- if (cookie == 0) do {
|
|
- get_next_image_info(B_CURRENT_TEAM, &cookie, &info);
|
|
- } while (info.type != B_APP_IMAGE);
|
|
+ while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
|
|
+ if (info.type == B_APP_IMAGE)
|
|
+ return info.name;
|
|
+ }
|
|
|
|
- return info.name;
|
|
+ return NULL;
|
|
}
|
|
#endif
|
|
diff --git a/src/setup.c b/src/setup.c
|
|
index 3ecb0f6..1a5844c 100644
|
|
--- a/src/setup.c
|
|
+++ b/src/setup.c
|
|
@@ -43,6 +43,7 @@
|
|
#include <errno.h>
|
|
#elif defined(__HAIKU__)
|
|
#include <FindDirectory.h>
|
|
+ #include "haiku.h"
|
|
#endif
|
|
|
|
#include "struct.h"
|
|
--
|
|
2.30.0
|
|
|