Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 77555
b: "refs/heads/CMSSW_7_1_X"
c: fbc8bd7
h: "refs/heads/CMSSW_7_1_X"
i:
  77553: 08a0490
  77551: ec454a3
v: v3
  • Loading branch information
Alja Mrak Tadel committed Nov 10, 2009
1 parent 01f58e9 commit 4eae78c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
"refs/heads/CMSSW_7_1_X": 026c82a8a7a3f1437bd9f5423bca216a44e847e9
"refs/heads/CMSSW_7_1_X": fbc8bd7e7fa9c5f5f4abe9f2730c1f7fc72fa908
6 changes: 3 additions & 3 deletions trunk/Fireworks/Core/src/CmsShowMain.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//
// Original Author:
// Created: Mon Dec 3 08:38:38 PST 2007
// $Id: CmsShowMain.cc,v 1.100 2009/11/10 14:38:11 amraktad Exp $
// $Id: CmsShowMain.cc,v 1.101 2009/11/10 15:02:06 amraktad Exp $
//

// system include files
Expand Down Expand Up @@ -851,7 +851,7 @@ CmsShowMain::setLiveMode()
m_liveTimer = new SignalTimer();
((SignalTimer*)m_liveTimer)->timeout_.connect(boost::bind(&CmsShowMain::checkLiveMode,this));

m_live->SetTime(600000);
m_liveTimer->SetTime(600000);
m_liveTimer->Reset();
m_liveTimer->TurnOn();
}
Expand Down Expand Up @@ -916,7 +916,7 @@ CmsShowMain::notified(TSocket* iSocket)
// bootstrap case: --port and no input file
if (m_inputFileName.empty())
{
m_navigator->firstEventInCurrentFile();
m_navigator->firstEvent();
}
m_inputFileName = fileName;
std::stringstream sr;
Expand Down

0 comments on commit 4eae78c

Please sign in to comment.