handle ThrowFatal for Haiku
Some checks are pending
Build Debian packages / bookworm (push) Waiting to run
Build Debian packages / bullseye (push) Waiting to run
Build Debian packages / trixie (push) Waiting to run
Build on FreeBSD / with UPnP (push) Waiting to run
Build on OSX / With USE_UPNP=no (push) Waiting to run
Build on OSX / With USE_UPNP=yes (push) Waiting to run
Build on Windows / ucrt-x86_64 (push) Waiting to run
Build on Windows / clang-x86_64 (push) Waiting to run
Build on Windows / i686 (push) Waiting to run
Build on Windows / x86_64 (push) Waiting to run
Build on Windows / CMake clang-x86_64 (push) Waiting to run
Build on Windows / CMake i686 (push) Waiting to run
Build on Windows / CMake ucrt-x86_64 (push) Waiting to run
Build on Windows / CMake x86_64 (push) Waiting to run
Build on Windows / XP (push) Waiting to run
Build on Ubuntu / Make with USE_UPNP=no (push) Waiting to run
Build on Ubuntu / Make with USE_UPNP=yes (push) Waiting to run
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Waiting to run
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Waiting to run
Build containers / Building container for linux/amd64 (push) Waiting to run
Build containers / Building container for linux/arm64 (push) Waiting to run
Build containers / Building container for linux/arm/v7 (push) Waiting to run
Build containers / Building container for linux/386 (push) Waiting to run
Build containers / Pushing merged manifest (push) Blocked by required conditions

This commit is contained in:
orignal 2025-09-19 13:40:41 -04:00
parent fd4635e8f4
commit 1f0512c4f6
2 changed files with 15 additions and 1 deletions

View file

@ -134,6 +134,7 @@ namespace util
return instance; return instance;
} }
bool init(int argc, char* argv[]);
void run (); void run ();
}; };
#define Daemon i2p::util::DaemonHaiku::Instance() #define Daemon i2p::util::DaemonHaiku::Instance()

View file

@ -9,12 +9,16 @@
#if defined(__HAIKU__) #if defined(__HAIKU__)
#include <memory> #include <memory>
#include <string>
#include <MenuItem.h> #include <MenuItem.h>
#include <MenuBar.h> #include <MenuBar.h>
#include <MessageRunner.h> #include <MessageRunner.h>
#include <Window.h> #include <Window.h>
#include <Application.h> #include <Application.h>
#include <Alert.h>
#include "version.h"
#include "Log.h"
#include "RouterContext.h" #include "RouterContext.h"
#include "Tunnel.h" #include "Tunnel.h"
#include "Daemon.h" #include "Daemon.h"
@ -44,7 +48,7 @@ class I2PApp: public BApplication
}; };
MainWindow::MainWindow (): MainWindow::MainWindow ():
BWindow (BRect(100, 100, 500, 400), "i2pd", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE), BWindow (BRect(100, 100, 500, 400), "i2pd " VERSION, B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE),
m_Messenger (nullptr, this) m_Messenger (nullptr, this)
{ {
auto r = Bounds (); r.bottom = 20; auto r = Bounds (); r.bottom = 20;
@ -94,6 +98,15 @@ namespace i2p
{ {
namespace util namespace util
{ {
bool DaemonHaiku::init(int argc, char* argv[])
{
i2p::log::SetThrowFunction ([](const std::string& s)
{
// BAlert ("Critical", s.c_str (), "Ok").Go ();
});
return Daemon_Singleton::init (argc, argv);
}
void DaemonHaiku::run () void DaemonHaiku::run ()
{ {
if (isDaemon) if (isDaemon)