hanging musrt0's should be eliminated now (MUSR-153)

This commit is contained in:
nemu
2010-10-29 05:29:49 +00:00
parent 622f656849
commit a6466e2dac
4 changed files with 18 additions and 2 deletions

View File

@ -511,6 +511,7 @@ PMusrT0::PMusrT0(PMusrT0Data &data) : fMusrT0Data(data)
fMainCanvas->Connect("ProcessedEvent(Int_t,Int_t,Int_t,TObject*)", "PMusrT0",
this, "HandleCmdKey(Int_t,Int_t,Int_t,TObject*)");
fMainCanvas->Connect("Closed()", "PMusrT0", this, "Quit()");
if (fMusrT0Data.GetCmdTag() != PMUSRT0_GET_T0)
fDataAndBkgEnabled = true;
@ -592,7 +593,7 @@ PMusrT0::~PMusrT0()
delete fLastDataLine;
fLastDataLine = 0;
}
if (fMainCanvas) {
if (fMainCanvas && (fStatus != 2)) {
delete fMainCanvas;
fMainCanvas = 0;
}
@ -665,6 +666,19 @@ void PMusrT0::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
}
}
//--------------------------------------------------------------------------
// Quit (public)
//--------------------------------------------------------------------------
/**
* <p>Slot called when the canvas is closed via the close icon (cross top right corner).
* It is emitting a global quit singal.
*/
void PMusrT0::Quit()
{
fStatus = 2; // will quit globally
Done(0);
}
//--------------------------------------------------------------------------
// SetMsrHandler
//--------------------------------------------------------------------------