backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-07 14:14:10 +08:00
Code Issues Projects Releases Wiki Activity

fixed problem with opening client and server. in some cases it

Browse Source 
would fail to open in such a way that it could never succeed
but it'd never stop retrying.  now terminating when open fails
such that it'll never succeed.
This commit is contained in:
crs
2002-07-31 12:39:34 +00:00
parent f5795a6630
commit 5e40de48f9
18 changed files with 141 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/server/CServer.cpp
View File

@@ -53,24 +53,23 @@ CServer::~CServer()
delete m_streamFilterFactory;
}
bool
void
CServer::open()
{
// open the screen
try {
log((CLOG_INFO "opening screen"));
openPrimaryScreen();
return true;
}
catch (XScreenOpenFailure&) {
// can't open screen yet. wait a few seconds to retry.
catch (XScreen&) {
// can't open screen
log((CLOG_INFO "failed to open screen"));
return false;
throw;
}
catch (XUnknownClient& e) {
// can't open screen yet. wait a few seconds to retry.
// can't open screen
log((CLOG_CRIT "unknown screen name `%s'", e.getName().c_str()));
return false;
throw;
}
}
@@ -1529,7 +1528,6 @@ void
CServer::openPrimaryScreen()
{
assert(m_primaryClient == NULL);
assert(m_screenFactory != NULL);
// reset sequence number
m_seqNum = 0;