initialize be_app before alerts
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 / clang-x86_64 (push) Waiting to run
Build on Windows / i686 (push) Waiting to run
Build on Windows / ucrt-x86_64 (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-21 09:39:18 -04:00
parent 7089742650
commit 40c96dcf69

View file

@ -19,6 +19,7 @@
#include "version.h" #include "version.h"
#include "Log.h" #include "Log.h"
#include "Config.h"
#include "RouterContext.h" #include "RouterContext.h"
#include "Tunnel.h" #include "Tunnel.h"
#include "Daemon.h" #include "Daemon.h"
@ -100,22 +101,29 @@ namespace util
{ {
bool DaemonHaiku::init(int argc, char* argv[]) bool DaemonHaiku::init(int argc, char* argv[])
{ {
i2p::log::SetThrowFunction ([](const std::string& s) i2p::config::GetOption("daemon", isDaemon);
{ if (!isDaemon)
// BAlert ("Critical", s.c_str (), "Ok").Go (); {
}); new I2PApp(); // set be_app
i2p::log::SetThrowFunction ([](const std::string& s)
{
auto alert = new BAlert (nullptr, s.c_str (), "Quit", nullptr, nullptr,
B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_STOP_ALERT);
alert->Go ();
});
}
return Daemon_Singleton::init (argc, argv); return Daemon_Singleton::init (argc, argv);
} }
void DaemonHaiku::run () void DaemonHaiku::run ()
{ {
if (isDaemon) if (be_app)
DaemonUnix::run ();
else
{ {
I2PApp app; be_app->Run ();
app.Run (); delete be_app;
} }
else
DaemonUnix::run ();
} }
} }
} }