forked from quickshell/quickshell
		
	fix: root is now destroyed on exit
This should fix a whole lot of things never being able to run cleanup.
This commit is contained in:
		
							parent
							
								
									b5110b759e
								
							
						
					
					
						commit
						bccf43f1f7
					
				
					 2 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
					@ -26,6 +26,11 @@ RootWrapper::RootWrapper(QString rootPath)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RootWrapper::~RootWrapper() {
 | 
				
			||||||
 | 
						// event loop may no longer be running so deleteLater is not an option
 | 
				
			||||||
 | 
						delete this->root;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void RootWrapper::reloadGraph(bool hard) {
 | 
					void RootWrapper::reloadGraph(bool hard) {
 | 
				
			||||||
	if (this->root != nullptr) {
 | 
						if (this->root != nullptr) {
 | 
				
			||||||
		this->engine.clearComponentCache();
 | 
							this->engine.clearComponentCache();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,6 +2,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <qobject.h>
 | 
					#include <qobject.h>
 | 
				
			||||||
#include <qqmlengine.h>
 | 
					#include <qqmlengine.h>
 | 
				
			||||||
 | 
					#include <qtclasshelpermacros.h>
 | 
				
			||||||
#include <qtmetamacros.h>
 | 
					#include <qtmetamacros.h>
 | 
				
			||||||
#include <qurl.h>
 | 
					#include <qurl.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,6 +14,8 @@ class RootWrapper: public QObject {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	explicit RootWrapper(QString rootPath);
 | 
						explicit RootWrapper(QString rootPath);
 | 
				
			||||||
 | 
						~RootWrapper() override;
 | 
				
			||||||
 | 
						Q_DISABLE_COPY_MOVE(RootWrapper);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	void reloadGraph(bool hard);
 | 
						void reloadGraph(bool hard);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue