TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

failsafe now in for systems without native

Browse Source
This commit is contained in:
Zachary Pavlov 2006-11-27 20:52:21 +00:00
parent 2e8c8423e6
commit 01c54a2d3c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/distributed/ConnectionRepository.py
View File

@ -392,7 +392,7 @@ class ConnectionRepository(
ch, serverList, 0, ch, serverList, 0,
successCallback, successArgs, successCallback, successArgs,
failureCallback, failureArgs) failureCallback, failureArgs)
elif self.connectMethod == self.CM_NSPR: elif self.connectMethod == self.CM_NSPR or (not hasattr(self,"connectNative")):
# Try each of the servers in turn. # Try each of the servers in turn.
for url in serverList: for url in serverList:
self.notify.info("Connecting to %s via NSPR interface." % (url.cStr())) self.notify.info("Connecting to %s via NSPR interface." % (url.cStr()))
@ -417,6 +417,9 @@ class ConnectionRepository(
# Failed to connect. # Failed to connect.
if failureCallback: if failureCallback:
failureCallback(0, '', *failureArgs) failureCallback(0, '', *failureArgs)
else:
print "uh oh, we aren't using one of the tri-state CM variables"
failureCallback(0, '', *failureArgs)
def disconnect(self): def disconnect(self):
""" """
Closes the previously-established connection. Closes the previously-established connection.

2
direct/src/distributed/DoInterestManager.py
View File

@ -141,6 +141,7 @@ class DoInterestManager(DirectObject.DirectObject):
""" """
Look into a (set of) zone(s). Look into a (set of) zone(s).
""" """
assert DoInterestManager.notify.debugCall() assert DoInterestManager.notify.debugCall()
#assert not self._noNewInterests #assert not self._noNewInterests
handle = self._getNextHandle() handle = self._getNextHandle()
@ -185,6 +186,7 @@ class DoInterestManager(DirectObject.DirectObject):
""" """
Stop looking in a (set of) zone(s) Stop looking in a (set of) zone(s)
""" """
assert DoInterestManager.notify.debugCall() assert DoInterestManager.notify.debugCall()
assert isinstance(handle, InterestHandle) assert isinstance(handle, InterestHandle)
existed = False existed = False