1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00

Fix plNetClient.

This commit is contained in:
Darryl Pogue
2012-01-29 01:46:26 -08:00
parent 745378f9be
commit e7319c8ab2
6 changed files with 20 additions and 12 deletions

View File

@ -912,8 +912,10 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
//--------------------------------------------------------------------
// BASIC LINK. Link to a unique instance of the age, if no instance specified.
case plNetCommon::LinkingRules::kBasicLink:
if (!info->HasAgeInstanceGuid())
info->SetAgeInstanceGuid(&plUUID(GuidGenerate()));
if (!info->HasAgeInstanceGuid()) {
plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
}
break;
//--------------------------------------------------------------------
@ -952,7 +954,8 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
info->SetAgeDescription(desc.c_str());
}
if (!info->HasAgeInstanceGuid()) {
info->SetAgeInstanceGuid(&plUUID(GuidGenerate()));
plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
}
// register this as an owned age now before we link to it.
@ -992,7 +995,8 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
}
if (!info->HasAgeInstanceGuid()) {
info->SetAgeInstanceGuid(&plUUID(GuidGenerate()));
plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
}
VaultRegisterOwnedAge(link);
@ -1078,10 +1082,10 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
case hsFail:
success = kLinkFailed;
break;
case FALSE:
case false:
success = kLinkDeferred;
break;
case TRUE:
case true:
success = kLinkImmediately;
}