Merge branch 'master' of https://git.teknik.io/gyroninja/netrunner

reltools/linux/package_from_linux.sh

@@ -4,6 +4,7 @@ cd netrunner-$(date +%F)
   # this now has the ttfs and pnm
   cp -r ../../../res .
   cp ../../../ca-bundle.crt .
+  cp ../../../browser.ntrml .
   cp ../../../netrunner .
 cd ..
 tar zcf netrunner-$(date +%F)-linux.tar.gz netrunner-$(date +%F)

src/browser.cpp

@@ -432,14 +432,14 @@ void Browser::addWindow() {
     newWindow->init(); // load our UI into it
     
     // we want each window to has it's own component tree, so each address bar can have different values
-    std::shared_ptr<Component> rootComponent = std::make_shared<Component>();
-    rootComponent->name = "rootComponent of browser";
-    this->createComponentTree(this->uiRootNode, rootComponent, newWindow);
-    rootComponent->resize(newWindow->windowWidth, newWindow->windowHeight);
+    std::shared_ptr<Component> p_rootComponent = std::make_shared<Component>();
+    p_rootComponent->name = "rootComponent of browser";
+    this->createComponentTree(this->uiRootNode, p_rootComponent, newWindow);
+    p_rootComponent->resize(newWindow->windowWidth, newWindow->windowHeight);
     
-    Component::printComponentTree(rootComponent, 0);
+    Component::printComponentTree(p_rootComponent, 0);
     
-    newWindow->rootComponent = rootComponent;
+    newWindow->rootComponent = p_rootComponent;
     newWindow->renderDirty = true;
     
     this->windows.push_back(std::move(newWindow));