diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index 8448734..4b3cb8f 100644 Binary files a/ServerLMS/Debug64/.ninja_deps and b/ServerLMS/Debug64/.ninja_deps differ diff --git a/ServerLMS/Debug64/.ninja_log b/ServerLMS/Debug64/.ninja_log index 190322c..acad010 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -46,3 +46,33 @@ 64 3704 7544803908142867 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj 51dcd51461a6b016 3704 4208 7544803913168184 libServerLMS.dll 72d9d1ee4784dd54 3704 4208 7544803913168184 libServerLMS.dll.a 72d9d1ee4784dd54 +15 70 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +15 70 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +15 70 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +15 70 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +15 70 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +15 70 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +15 70 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +15 70 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +70 2564 7544822244090533 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a +2564 3147 7544822249891861 libServerLMS.dll 72d9d1ee4784dd54 +2564 3147 7544822249891861 libServerLMS.dll.a 72d9d1ee4784dd54 +18 58 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 58 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 58 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 58 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +18 58 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 58 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 58 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 58 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +58 2308 7544829037591958 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a +2308 2786 7544829042345253 libServerLMS.dll 72d9d1ee4784dd54 +2308 2786 7544829042345253 libServerLMS.dll.a 72d9d1ee4784dd54 +18 56 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 56 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 56 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 56 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj index 1eb5863..3b24be4 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index 65414da..53271b1 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt @@ -1,38 +1,38 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp - uic:ui_serverlmswidget.h -D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp -D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp -D:/LMS/ServerLMS/ServerLMS/messangerwidget.cpp - uic:ui_messangerwidget.h -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp -D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h -D:/LMS/ServerLMS/ServerLMS/Client.h -D:/LMS/ServerLMS/ServerLMS/multithreadserver.h - mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h +D:/LMS/ServerLMS/ServerLMS/multithreadserver.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Client.h +D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/messangerwidget.cpp + uic:ui_messangerwidget.h +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp +D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp +D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp +D:/LMS/ServerLMS/ServerLMS/messangerwidget.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/clienthandler.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/tools.h +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h + mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp D:/LMS/ServerLMS/ServerLMS/Systems/logger.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/tools.h -D:/LMS/ServerLMS/ServerLMS/clienthandler.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp -D:/LMS/ServerLMS/ServerLMS/messangerwidget.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h - mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp + uic:ui_serverlmswidget.h diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index 824f45f..8d5baa9 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll and b/ServerLMS/Debug64/libServerLMS.dll differ diff --git a/ServerLMS/Debug64/libServerLMS.dll.a b/ServerLMS/Debug64/libServerLMS.dll.a index e7c66ff..aea7f8f 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll.a and b/ServerLMS/Debug64/libServerLMS.dll.a differ diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/ServerLMS/serverlmswidget.cpp index 67dcfe6..15f733f 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -142,7 +142,8 @@ bool ServerLMSWidget::stopServer() autorizationHandler(clientsMap[idSocket]->getClient()->getLogin()); clientsMap[idSocket]->sigSocketClose(); - clientsMap.remove(idSocket); + //clientsMap.remove(idSocket); + removeClient(idSocket); } //Закрываем сервер @@ -198,6 +199,7 @@ void ServerLMSWidget::slotAddToMessanger(QString login, QString text) void ServerLMSWidget::removeClient(int idSocket) { clientsMap.remove(idSocket); + slotUpdateListClients(); } void ServerLMSWidget::addClient(qintptr descriptor, ClientHandler *client) diff --git a/TestServerLMS/Debug64/.ninja_log b/TestServerLMS/Debug64/.ninja_log index a7892c1..3bb7a72 100644 --- a/TestServerLMS/Debug64/.ninja_log +++ b/TestServerLMS/Debug64/.ninja_log @@ -44,3 +44,15 @@ 47 2260 7544804014595305 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj 4bc2eca6dcd8a69e 52 2391 7544804015892464 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 365b2bb39da65578 2391 2582 7544804017788729 TestServerLMS.exe 66dadfaf4d2d246e +14 61 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +14 61 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +14 61 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +14 61 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +14 61 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +14 61 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +15 46 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +15 46 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +15 46 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +15 46 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +15 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index 824f45f..8d5baa9 100644 Binary files a/TestServerLMS/Debug64/libServerLMS.dll and b/TestServerLMS/Debug64/libServerLMS.dll differ