diff options
| author | Max Kellermann <max@musicpd.org> | 2016-09-05 10:53:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2016-09-05 11:37:58 +0200 |
| commit | 871063dab749cb03729d49a838f76634426f30ad (patch) | |
| tree | 2637f234532d3c2218bbc37408202ccb40260af8 /src/Main.cxx | |
| parent | 135662d6b0714d123afa805a62462fff917943b5 (diff) | |
neighbor/Plugin: migrate from class Error to C++ exceptions
Diffstat (limited to 'src/Main.cxx')
| -rw-r--r-- | src/Main.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index acb4b6b67..cb93a4c13 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -461,10 +461,7 @@ int mpd_main(int argc, char *argv[]) #ifdef ENABLE_NEIGHBOR_PLUGINS instance->neighbors = new NeighborGlue(); - if (!instance->neighbors->Init(io_thread_get(), *instance, error)) { - LogError(error); - return EXIT_FAILURE; - } + instance->neighbors->Init(io_thread_get(), *instance); if (instance->neighbors->IsEmpty()) { delete instance->neighbors; @@ -563,9 +560,8 @@ try { io_thread_start(); #ifdef ENABLE_NEIGHBOR_PLUGINS - if (instance->neighbors != nullptr && - !instance->neighbors->Open(error)) - FatalError(error); + if (instance->neighbors != nullptr) + instance->neighbors->Open(); #endif ZeroconfInit(instance->event_loop); |