From a3a541eebd0b2ffe2e2ba30acf1c87d5ed9cf98f Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 30 Mar 2013 20:17:39 +0100 Subject: [PATCH] Make a copy of the network config message and store that one. Using the original message and storing that into the settings resulted in a not yet fully understood deadlock. Presumably related to missing and/or stray replies. --- src/servers/net/NetServer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp index 2e9c045f09..27da836cdd 100644 --- a/src/servers/net/NetServer.cpp +++ b/src/servers/net/NetServer.cpp @@ -351,9 +351,10 @@ NetServer::MessageReceived(BMessage* message) case kMsgAddPersistentNetwork: { - status_t result = _ConvertNetworkToSettings(*message); + BMessage network = *message; + status_t result = _ConvertNetworkToSettings(network); if (result == B_OK) - result = fSettings.AddNetwork(*message); + result = fSettings.AddNetwork(network); BMessage reply(B_REPLY); reply.AddInt32("status", result);