Updated TODO + workaround for the signal problem after logout

This commit is contained in:
emeric
2014-08-23 14:13:16 +02:00
parent f80f052d55
commit d018922847
5 changed files with 26 additions and 13 deletions
+7 -3
View File
@@ -60,8 +60,7 @@ LmsApplication::handleAuthEvent(void)
if (_sessionData.getDatabaseHandler().getLogin().loggedIn())
{
if (_home == nullptr) {
_home = new LmsHome(_sessionData );
root()->addWidget( _home );
_home = new LmsHome(_sessionData, root() );
}
else
std::cerr << "Already logged in??" << std::endl;
@@ -70,9 +69,14 @@ LmsApplication::handleAuthEvent(void)
{
std::cerr << "user log out" << std::endl;
if (_home != nullptr) {
std::cerr << "Deleting home pointer..." << std::endl;
delete _home;
_home = nullptr;
// Hack: quit/redirect in order to avoid 'signal not exposed' problems
// TODO, investigate/remove?
quit();
redirect("/");
}
else
std::cerr << "Already logged out??" << std::endl;
+4 -3
View File
@@ -11,8 +11,9 @@
namespace UserInterface {
LmsHome::LmsHome(SessionData& sessionData)
: _sessionData(sessionData)
LmsHome::LmsHome(SessionData& sessionData, Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent),
_sessionData(sessionData)
{
const Wt::Auth::User& user = sessionData.getDatabaseHandler().getLogin().user();
@@ -25,7 +26,7 @@ LmsHome::LmsHome(SessionData& sessionData)
Wt::WStackedWidget *contentsStack = new Wt::WStackedWidget(this);
// Setup a Left-aligned menu.
Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack, this);
Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack);
navigation->addMenu(leftMenu);
_audioWidget = new AudioWidget(_sessionData);
+1 -1
View File
@@ -15,7 +15,7 @@ class LmsHome : public Wt::WContainerWidget
{
public:
LmsHome(SessionData& sessionData);
LmsHome(SessionData& sessionData, Wt::WContainerWidget* parent = 0);
private: