{
if (container_ != nullptr)
{
- RootView::GetInstance()->Remove(compassView);
- RootView::GetInstance()->Remove(compassCalibrationView);
-
- delete compassView;
- compassView = nullptr;
-
- delete compassCalibrationView;
- compassCalibrationView = nullptr;
-
+ container_->RemoveAll();
+ if(compassView!=nullptr)
+ {
+ delete compassView;
+ compassView = nullptr;
+ }
+ if(compassCalibrationView!=nullptr)
+ {
+ delete compassCalibrationView;
+ compassCalibrationView = nullptr;
+ }
delete container_;
container_ = nullptr;
}