Avoid assert() when loading xml: Throw an XMLerror if attribute_value fails.

[ardour.git] / libs / pbd / pbd.cc

diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc
index a4e4f6c9a3fd34164adde04bfb93a688071b6534..a7a818ee5ffff8782c16451dc67e8bad39971c22 100644 (file)
--- a/libs/pbd/pbd.cc
+++ b/libs/pbd/pbd.cc
@@ -42,7 +42,7 @@
 #include "pbd/windows_mmcss.h"
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 extern void setup_libpbd_enums ();
 
@@ -101,14 +101,13 @@ PBD::init ()
 
        /* Initialize windows socket DLL for PBD::CrossThreadChannel
         */
-       
+
        if (WSAStartup(MAKEWORD(1,1),&wsaData) != 0) {
-               fatal << X_("Windows socket initialization failed with error: ") << WSAGetLastError() << endmsg;
-               abort();
-               /*NOTREACHED*/
+               error << X_("Windows socket initialization failed with error: ") << WSAGetLastError() << endmsg;
                return false;
        }
 
+       QPC::initialize();
        test_timers_from_env ();
 
        if (!PBD::MMCSS::initialize()) {
@@ -140,7 +139,7 @@ PBD::cleanup ()
 #ifdef PLATFORM_WINDOWS
        PBD::MMCSS::deinitialize ();
        WSACleanup();
-#endif 
+#endif
 
        EnumWriter::destroy ();
        FPU::destroy ();